wine/gecko
0
0
Fork 0
mirror of https://gitlab.winehq.org/wine/wine-gecko.git synced 2024-09-13 09:24:08 -07:00
Code Issues Packages Projects Releases Wiki Activity

Bug 589413 - Failure to open libnss3.so when Firefox path contains UTF-8 characters. Part 1 part 2: default to UTF8. r=Waldo, a=final+

Browse Source
This commit is contained in:
Dan Witte 2010-09-13 10:54:02 -07:00
parent fbc0be1b6e
commit 904aa1ee11
3 changed files with 23 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
js/src/ctypes/CTypes.cpp
View File

@ -468,12 +468,6 @@ static inline bool FloatIsFinite(jsdouble f) {
#endif
}
JS_ALWAYS_INLINE void
ASSERT_OK(JSBool ok)
{
JS_ASSERT(ok);
}
JS_ALWAYS_INLINE JSString*
NewUCString(JSContext* cx, const AutoString& from)
{

6
js/src/ctypes/CTypes.h
View File

@ -219,6 +219,12 @@ StringsEqual(Vector<jschar, N, AP> &v, JSString* str)
** Function and struct API definitions
*******************************************************************************/
JS_ALWAYS_INLINE void
ASSERT_OK(JSBool ok)
{
JS_ASSERT(ok);
}
// for JS error reporting
enum ErrorNum {
#define MSG_DEF(name, number, count, exception, format) \

28
js/src/ctypes/Library.cpp
View File

@ -147,21 +147,29 @@ Library::Create(JSContext* cx, jsval path, JSCTypesCallbacks* callbacks)
#else
// Convert to platform native charset if the appropriate callback has been
// provided.
const char* pathBytes;
bool requireFree = false;
char* pathBytes;
if (callbacks && callbacks->unicodeToNative) {
pathBytes =
callbacks->unicodeToNative(cx, pathStr->chars(), pathStr->length());
requireFree = true;
if (!pathBytes)
return NULL;
} else {
// Fallback: sssume the platform native charset is UTF-8. This is true
// Fallback: assume the platform native charset is UTF-8. This is true
// for Mac OS X, Android, and probably Linux.
pathBytes = JS_GetStringBytesZ(cx, pathStr);
}
size_t nbytes =
js_GetDeflatedUTF8StringLength(cx, pathStr->chars(), pathStr->length());
if (nbytes == (size_t) -1)
return NULL;
if (!pathBytes)
return NULL;
pathBytes = static_cast<char*>(JS_malloc(cx, nbytes + 1));
if (!pathBytes)
return NULL;
ASSERT_OK(js_DeflateStringToUTF8Buffer(cx, pathStr->chars(),
pathStr->length(), pathBytes, &nbytes));
pathBytes[nbytes] = 0;
}
libSpec.value.pathname = pathBytes;
libSpec.type = PR_LibSpec_Pathname;
@ -169,9 +177,7 @@ Library::Create(JSContext* cx, jsval path, JSCTypesCallbacks* callbacks)
PRLibrary* library = PR_LoadLibraryWithFlags(libSpec, 0);
#ifndef XP_WIN
if (requireFree) {
JS_free(cx, const_cast<char*>(pathBytes));
}
JS_free(cx, pathBytes);
#endif
if (!library) {
JS_ReportError(cx, "couldn't open library");