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 946843 - XDR the column of JSScript. r=luke

Browse Source
This commit is contained in:
Nicolas B. Pierron 2013-12-19 09:20:35 -08:00
parent 32ee32e9b7
commit 91e2a2f115
2 changed files with 8 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
js/src/jsscript.cpp
View File

@ -425,7 +425,7 @@ js::XDRScript(XDRState<mode> *xdr, HandleObject enclosingScope, HandleScript enc
TreatAsRunOnce
};
uint32_t length, lineno, nslots;
uint32_t length, lineno, column, nslots;
uint32_t natoms, nsrcnotes, i;
uint32_t nconsts, nobjects, nregexps, ntrynotes, nblockscopes;
uint32_t prologLength, version;
@ -466,6 +466,7 @@ js::XDRScript(XDRState<mode> *xdr, HandleObject enclosingScope, HandleScript enc
JS_ASSERT(script->getVersion() != JSVERSION_UNKNOWN);
version = (uint32_t)script->getVersion() | (script->nfixed() << 16);
lineno = script->lineno();
column = script->column();
nslots = (uint32_t)script->nslots();
nslots = (uint32_t)((script->staticLevel() << 16) | script->nslots());
natoms = script->natoms();
@ -654,11 +655,15 @@ js::XDRScript(XDRState<mode> *xdr, HandleObject enclosingScope, HandleScript enc
if (!xdr->codeUint32(&script->sourceEnd_))
return false;
if (!xdr->codeUint32(&lineno) || !xdr->codeUint32(&nslots))
if (!xdr->codeUint32(&lineno) || !xdr->codeUint32(&column) ||
!xdr->codeUint32(&nslots))
{
return false;
}
if (mode == XDR_DECODE) {
script->lineno_ = lineno;
script->column_ = column;
script->nslots_ = uint16_t(nslots);
script->staticLevel_ = uint16_t(nslots >> 16);
}

2
js/src/vm/Xdr.h
View File

@ -22,7 +22,7 @@ namespace js {
* and saved versions. If deserialization fails, the data should be
* invalidated if possible.
*/
static const uint32_t XDR_BYTECODE_VERSION = uint32_t(0xb973c0de - 158);
static const uint32_t XDR_BYTECODE_VERSION = uint32_t(0xb973c0de - 159);
class XDRBuffer {
public: