Itms/0ad
1
0
Fork 0
forked from 0ad/0ad
Code Pull Requests Activity

Decode input as utf-8 in JSI_VFS::ReadFile, JSI_VFS::ReadFileLines

Browse Source 
This was SVN commit r6998.
This commit is contained in:
Ykkrosh 2009-07-16 15:51:35 +00:00
parent 60c5beddc0
commit 271823cf7e
1 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
source/ps/scripting/JSInterface_VFS.cpp
View File

@ -186,7 +186,8 @@ JSBool JSI_VFS::ReadFile( JSContext* cx, JSObject* UNUSED(obj), uintN argc, jsva
// Fix CRLF line endings. (This function will only ever be used on text files.)
contents.Replace("\r\n", "\n");
*rval = ToJSVal( contents );
// Decode as UTF-8
*rval = ToJSVal( contents.FromUTF8() );
return( JS_TRUE );
}
@ -228,7 +229,8 @@ JSBool JSI_VFS::ReadFileLines( JSContext* cx, JSObject* UNUSED(obj), uintN argc,
int cur_line = 0;
while( std::getline( ss, line ) )
{
jsval val = ToJSVal( CStr( line ) );
// Decode each line as UTF-8
jsval val = ToJSVal( CStr( line ).FromUTF8() );
JS_SetElement( cx, line_array, cur_line++, &val );
}