Bug 1349531 - Remove non-threadsafe static buffers, r=jandem
--- a/js/src/shell/OSObject.cpp
+++ b/js/src/shell/OSObject.cpp
@@ -118,17 +118,17 @@ ResolvePath(JSContext* cx, HandleString
if (!scriptFilename.get())
return nullptr;
if (strcmp(scriptFilename.get(), "-e") == 0 || strcmp(scriptFilename.get(), "typein") == 0)
resolveMode = RootRelative;
}
- static char buffer[PATH_MAX+1];
+ char buffer[PATH_MAX+1];
if (resolveMode == ScriptRelative) {
#ifdef XP_WIN
// The docs say it can return EINVAL, but the compiler says it's void
_splitpath(scriptFilename.get(), nullptr, buffer, nullptr, nullptr);
#else
strncpy(buffer, scriptFilename.get(), PATH_MAX+1);
if (buffer[PATH_MAX] != '\0')
return nullptr;
@@ -227,17 +227,17 @@ FileAsTypedArray(JSContext* cx, JS::Hand
}
/**
* Return the current working directory or |null| on failure.
*/
UniqueChars
GetCWD()
{
- static char buffer[PATH_MAX + 1];
+ char buffer[PATH_MAX + 1];
const char* cwd = getcwd(buffer, PATH_MAX);
if (!cwd)
return UniqueChars();
return js::DuplicateString(buffer);
}
static bool
ReadFile(JSContext* cx, unsigned argc, Value* vp, bool scriptRelative)