aniani/elinks
1
0
Fork 0
mirror of https://github.com/rkd77/elinks.git synced 2024-12-04 14:46:47 -05:00
Code

[smjs] Fix double encoding to utf-8

Browse Source
This commit is contained in:
Witold Filipczyk 2022-06-17 19:26:18 +02:00
parent 89238867f2
commit 50b1406cf0
1 changed files with 11 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
src/scripting/smjs/cache_object.c
View File

@ -107,6 +107,16 @@ cache_entry_get_property_content(JSContext *ctx, unsigned int argc, JS::Value *v
return ret; return ret;
} }
static char *
jsval_to_Latin1(JSContext *ctx, JS::HandleValue hvp)
{
/* Memory must be freed in caller */
JSString *st = JS::ToString(ctx, hvp);
JS::UniqueChars chars = JS_EncodeStringToLatin1(ctx, st);
return null_or_stracpy(chars.get());
}
static bool static bool
cache_entry_set_property_content(JSContext *ctx, unsigned int argc, JS::Value *vp) cache_entry_set_property_content(JSContext *ctx, unsigned int argc, JS::Value *vp)
{ {
@ -136,7 +146,7 @@ cache_entry_set_property_content(JSContext *ctx, unsigned int argc, JS::Value *v
* eventually unlock the object. */ * eventually unlock the object. */
object_lock(cached); object_lock(cached);
str = jsval_to_string(smjs_ctx, args[0]); str = jsval_to_Latin1(smjs_ctx, args[0]);
len = strlen(str); len = strlen(str);
add_fragment(cached, 0, str, len); add_fragment(cached, 0, str, len);
normalize_cache_entry(cached, len); normalize_cache_entry(cached, len);
@ -204,19 +214,14 @@ cache_entry_set_property_type(JSContext *ctx, unsigned int argc, JS::Value *vp)
* collect garbage. After this, all code paths must * collect garbage. After this, all code paths must
* eventually unlock the object. */ * eventually unlock the object. */
object_lock(cached); object_lock(cached);
str = jsval_to_string(smjs_ctx, args[0]); str = jsval_to_string(smjs_ctx, args[0]);
mem_free_set(&cached->content_type, stracpy(str)); mem_free_set(&cached->content_type, stracpy(str));
object_unlock(cached); object_unlock(cached);
return true; return true;
} }
/** Pointed to by cache_entry_class.finalize. SpiderMonkey /** Pointed to by cache_entry_class.finalize. SpiderMonkey
* automatically finalizes all objects before it frees the JSRuntime, * automatically finalizes all objects before it frees the JSRuntime,
* so cache_entry.jsobject won't be left dangling. */ * so cache_entry.jsobject won't be left dangling. */