# HG changeset patch
# User Terrence Cole <terrence@mozilla.com>
# Date 1453848818 28800
#      Tue Jan 26 14:53:38 2016 -0800
# Branch THUNDERBIRD3880_2016050308_RELBRANCH
# Node ID a3ffe5c3780ed40657183ce256b9bfb4152f20cb
# Parent  f3ab833017e02cddb61a108cb3d86d68844959a8
Bug 1007136 - Ensure malloc/free always match when using JSAutoByteString. r=bz, a=lizzard

diff --git a/js/src/jsapi.h b/js/src/jsapi.h
--- a/js/src/jsapi.h
+++ b/js/src/jsapi.h
@@ -4054,17 +4054,17 @@
 
     explicit JSAutoByteString(MOZ_GUARD_OBJECT_NOTIFIER_ONLY_PARAM)
       : mBytes(nullptr)
     {
         MOZ_GUARD_OBJECT_NOTIFIER_INIT;
     }
 
     ~JSAutoByteString() {
-        js_free(mBytes);
+        JS_free(nullptr, mBytes);
     }
 
     /* Take ownership of the given byte array. */
     void initBytes(char* bytes) {
         MOZ_ASSERT(!mBytes);
         mBytes = bytes;
     }
 
@@ -4099,17 +4099,17 @@
 
     size_t length() const {
         if (!mBytes)
             return 0;
         return strlen(mBytes);
     }
 
   private:
-    char*       mBytes;
+    char* mBytes;
     MOZ_DECL_USE_GUARD_OBJECT_NOTIFIER
 
     /* Copy and assignment are not supported. */
     JSAutoByteString(const JSAutoByteString& another);
     JSAutoByteString& operator=(const JSAutoByteString& another);
 };
 
 namespace JS {
