Add local secure_getenv() and fix sizeof call

rnchamberlain · rnchamberlain · commit 7cd3f76f7114 · 2016-10-17T11:43:43.000+01:00
diff --git a/src/node_report.cc b/src/node_report.cc
@@ -21,7 +21,6 @@
 #include <VersionHelpers.h>
 #else
 #include <sys/time.h>
-#include <unistd.h>
 #include <sys/resource.h>
 #include <inttypes.h>
 #include <cxxabi.h>
@@ -561,7 +560,7 @@ void PrintNativeStack(FILE* fp) {
     if (SymFromAddr(hProcess, dwAddress, &dwOffset64, pSymbol)) {
         DWORD dwOffset = 0;
         IMAGEHLP_LINE64 line;
-        line.SizeOfStruct = sizeof(IMAGEHLP_LINE64);
+        line.SizeOfStruct = sizeof(line);
         if (SymGetLineFromAddr64(hProcess, dwAddress, &dwOffset, &line)) {
           fprintf(fp, "%2d: [pc=0x%p] %s [+%d] in %s: line: %lu\n", i, pSymbol->Address, pSymbol->Name, dwOffset, line.FileName, line.LineNumber);
         } else {
diff --git a/src/node_report.h b/src/node_report.h
@@ -2,9 +2,13 @@
 #define SRC_NODE_REPORT_H_
 
 #include "nan.h"
-#if !defined(_WIN32) && !defined(__APPLE__)
+#ifndef _WIN32
+#include <unistd.h>
+#include <sys/types.h>
+#ifndef __APPLE__
 #include <features.h>
 #endif
+#endif
 
 namespace nodereport {
 
@@ -40,14 +44,14 @@ unsigned int ProcessNodeReportVerboseSwitch(const char* args);
 
 void SetLoadTime();
 
-// secure_getenv() only available in glibc, revert to getenv() otherwise
-#if defined(__GLIBC__)
-#if !__GLIBC_PREREQ(2, 17)
-#define secure_getenv getenv
-#endif  // !__GLIBC_PREREQ(2, 17)
-#else
-#define secure_getenv getenv
-#endif  // defined(__GLIBC__)
+// Local implementation of secure_getenv()
+inline const char* secure_getenv(const char* key) {
+#ifndef _WIN32
+  if (getuid() != geteuid() || getgid() != getegid())
+    return nullptr;
+#endif
+  return getenv(key);
+}
 
 // Emulate arraysize() on Windows pre Visual Studio 2015
 #if defined(_MSC_VER) && _MSC_VER < 1900
