← Back to branch summary

~ubuntu-branches/ubuntu/gutsy/firefox/gutsy

« back to all changes in this revision

Viewing changes to js/src/xpconnect/loader/mozJSComponentLoader.cpp

  • Committer: Bazaar Package Importer
  • Author(s): Ian Jackson
  • Date: 2006-10-10 18:49:32 UTC
  • mfrom: (1.1.8 upstream)
  • Revision ID: james.westby@ubuntu.com-20061010184932-da75izt7y0e59afq
Tags: 1.99+2.0rc2+dfsg-0ubuntu1
* New upstream version 2.0rc2.
* Fix/workaround for epiphany GtkSocket lifetype crash:
  apply patch id=241087 from Mozilla Bugzilla #241535 to fix LP #63814.
* Change application name to `Firefox', as requested by mdz.
  Files changed:
    - browser/locales/en-US/chrome/branding/brand.dtd
    - browser/locales/en-US/chrome/branding/brand.properties;
  New values:
    - brandShortName and brandFullName: `Bon Echo' => `Firefox'
    - vendorShortName: `Mozilla' => `Ubuntu'
* Make preferences dialogue fit again (bah!).

Show diffs side-by-side

added added

removed removed

Lines of Context:
js/src/xpconnect/loader/mozJSComponentLoader.cpp
1180
1180
                        }
1181
1181
                    }
1182
1182
                }
 
1183
 
 
1184
                if (NS_SUCCEEDED(rv)) {
 
1185
                    /* Get the JS bytecode version number and validate it. */
 
1186
                    PRUint32 version;
 
1187
                    rv = mFastLoadInput->Read32(&version);
 
1188
                    if (NS_SUCCEEDED(rv) && version != JSXDR_BYTECODE_VERSION) {
 
1189
                        LOG(("Bad JS bytecode version\n"));
 
1190
                        rv = NS_ERROR_UNEXPECTED;
 
1191
                    }
 
1192
                }
1183
1193
            }
1184
1194
            if (NS_FAILED(rv)) {
1185
1195
                LOG(("Invalid fastload file detected, removing it\n"));
1204
1214
 
1205
1215
            rv = flSvc->NewOutputStream(output,
1206
1216
                                        getter_AddRefs(mFastLoadOutput));
 
1217
 
 
1218
            if (NS_SUCCEEDED(rv))
 
1219
                rv = mFastLoadOutput->Write32(JSXDR_BYTECODE_VERSION);
 
1220
 
1207
1221
            if (NS_FAILED(rv)) {
1208
1222
                LOG(("Fatal error, could not create fastload file\n"));
1209
1223