浏览代码

Only disallow directories as input files

June 5 年之前
父节点
当前提交
2b7b7f7f72
共有 1 个文件被更改,包括 2 次插入6 次删除
  1. 2 6
      src/google/protobuf/compiler/importer.cc

+ 2 - 6
src/google/protobuf/compiler/importer.cc

@@ -495,12 +495,8 @@ io::ZeroCopyInputStream* DiskSourceTree::OpenDiskFile(
   do {
     ret = stat(filename.c_str(), &sb);
   } while (ret != 0 && errno == EINTR);
-#ifdef _WIN32
-  if ((sb.st_mode & _S_IFMT) == _S_IFREG) {
-#else
-  if (!S_ISREG(sb.st_mode)) {
-#endif
-    last_error_message_ = "Input file is not a regular file.";
+  if (sb.st_mode & S_IFDIR) {
+    last_error_message_ = "Input file is a directory.";
     return NULL;
   }
   int file_descriptor;