Attachment #575286 for bug #685092

View | Details | Raw Unified | Return to bug 685092
Collapse All | Expand All




                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) {

Return to bug 685092

Lines 2218-2232 Link Here

(-)a/mozilla/js/xpconnect/src/XPCWrappedNative.cpp.ORIG (-3 / +4 lines)
2218	const char* fmt = (i == 0) ?	2218	const char* fmt = (i == 0) ?
2219	"(%s" : (i == count-1) ?	2219	"(%s" : (i == count-1) ?
2220	", %s)" : ", %s";	2220	", %s)" : ", %s";
		2221
		2222	if (!name) {
		2223	return nullptr;
		2224	}
2221	name = JS_sprintf_append(name, fmt,	2225	name = JS_sprintf_append(name, fmt,
2222	array[i]->GetNameString());	2226	array[i]->GetNameString());
2223	}	2227	}
2224	}	2228	}
2225	}	2229	}
2226		2230
2227	if (!name) {
2228	return nullptr;
2229	}
2230	const char* fmt = "[xpconnect wrapped %s" FMT_ADDR FMT_STR(" (native")	2231	const char* fmt = "[xpconnect wrapped %s" FMT_ADDR FMT_STR(" (native")
2231	FMT_ADDR FMT_STR(")") "]";	2232	FMT_ADDR FMT_STR(")") "]";
2232	if (si) {	2233	if (si) {