Bug 798491: Followup bustage fix.
authorKyle Huey <khuey@kylehuey.com>
Tue, 30 Oct 2012 08:42:47 -0700
changeset 111910 e0cf397089ec879a15c170cbf1a100892d5727d6
parent 111909 dffca1d334aea12f5ba2dd94286d6cc858b0f745
child 111911 33df4d95396a669565f7e9bc2543cf69bc9892a8
push id93
push usernmatsakis@mozilla.com
push dateWed, 31 Oct 2012 21:26:57 +0000
bugs798491
milestone19.0a1
Bug 798491: Followup bustage fix.
js/xpconnect/loader/mozJSComponentLoader.cpp
--- a/js/xpconnect/loader/mozJSComponentLoader.cpp
+++ b/js/xpconnect/loader/mozJSComponentLoader.cpp
@@ -1233,17 +1233,17 @@ mozJSComponentLoader::ImportInto(const n
 
             // Something failed, but we don't know what it is, guess.
             return NS_ERROR_FILE_NOT_FOUND;
         }
 
         // Set the location information for the new global, so that tools like
         // about:memory may use that information
         if (!mReuseLoaderGlobal) {
-            xpc::SetLocationForGlobal(newEntry->global, aLocation);
+            xpc::SetLocationForGlobal(newEntry->obj, aLocation);
         }
 
         mod = newEntry;
     }
 
     NS_ASSERTION(mod->obj, "Import table contains entry with no object");
     *_retval = mod->obj;