summaryrefslogtreecommitdiff
blob: 87d14e6a16c4a902c2c7e870623d18bfcf7b9508 (plain)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
--- a/mozilla/js/xpconnect/src/XPCWrappedNative.cpp.ORIG	2018-07-09 21:54:43.000000000 +0200
+++ b/mozilla/js/xpconnect/src/XPCWrappedNative.cpp	2019-05-04 17:49:23.893560494 +0200
@@ -2218,15 +2218,16 @@
                 const char* fmt = (i == 0) ?
                                     "(%s" : (i == count-1) ?
                                         ", %s)" : ", %s";
+                
+                if (!name) {
+                    return nullptr;
+                }
                 name = JS_sprintf_append(name, fmt,
                                          array[i]->GetNameString());
             }
         }
     }
 
-    if (!name) {
-        return nullptr;
-    }
     const char* fmt = "[xpconnect wrapped %s" FMT_ADDR FMT_STR(" (native")
         FMT_ADDR FMT_STR(")") "]";
     if (si) {