corysanin/tubestation
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Bug 868725 - Pass non-const jschar* to AtomizeAndTakeOwnership; r=evilpie

Browse Source
This commit is contained in:
Ms2ger
2013-05-05 09:03:18 +02:00
parent 2da077582e
commit 08c2f238af
1 changed files with 5 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
js/src/jsatom.cpp
View File

@@ -234,13 +234,12 @@ enum OwnCharsBehavior
*/
JS_ALWAYS_INLINE
static JSAtom *
AtomizeAndTakeOwnership(JSContext *cx, const jschar *tbchars, size_t length,
InternBehavior ib)
AtomizeAndTakeOwnership(JSContext *cx, jschar *tbchars, size_t length, InternBehavior ib)
{
JS_ASSERT(tbchars[length] == 0);
if (JSAtom *s = cx->runtime->staticStrings.lookup(tbchars, length)) {
js_free((void*)tbchars);
js_free(tbchars);
return s;
}
@@ -256,15 +255,15 @@ AtomizeAndTakeOwnership(JSContext *cx, const jschar *tbchars, size_t length,
if (p) {
JSAtom *atom = p->asPtr();
p->setTagged(bool(ib));
js_free((void*)tbchars);
js_free(tbchars);
return atom;
}
AutoEnterAtomsCompartment ac(cx);
JSFlatString *flat = js_NewString<CanGC>(cx, const_cast<jschar*>(tbchars), length);
JSFlatString *flat = js_NewString<CanGC>(cx, tbchars, length);
if (!flat) {
js_free((void*)tbchars);
js_free(tbchars);
return NULL;
}