mozilla-central: changeset 113621:fd7927a8baf87cb1d8c0b223c42e8fd01bb5ed9d

author	Josh Matthews <josh@joshmatthews.net>
	Sat, 17 Nov 2012 13:27:01 +0000
changeset 113621	fd7927a8baf87cb1d8c0b223c42e8fd01bb5ed9d
parent 113620	9771925bee9e964f942fb439821a9f19579adb59
child 113622	278bf5deb265a8d50fef9f5df53a239ab6e2ded8
push id	23880
push user	ryanvm@gmail.com
push date	Sun, 18 Nov 2012 13:36:46 +0000
treeherder	mozilla-central@174440fca7da [default view] [failures only]
perfherder	[talos] [build metrics] [platform microbench] (compared to previous push)
reviewers	mayhemer
bugs	812203
milestone	19.0a1
first release with	nightly linux32 4fddb9923ef0 / 19.0a1 / 20121119030725 / files nightly linux64 4fddb9923ef0 / 19.0a1 / 20121119030725 / files nightly mac 4fddb9923ef0 / 19.0a1 / 20121119030725 / files nightly win32 4fddb9923ef0 / 19.0a1 / 20121119030725 / files nightly win64 4fddb9923ef0 / 19.0a1 / 20121119030725 / files
last release without	nightly linux32 9a6d708faf3f / 19.0a1 / 20121117030747 / files nightly linux64 9a6d708faf3f / 19.0a1 / 20121117030747 / files nightly mac 9a6d708faf3f / 19.0a1 / 20121117030747 / files nightly win32 9a6d708faf3f / 19.0a1 / 20121117030747 / files nightly win64 9a6d708faf3f / 19.0a1 / 20121117030747 / files

--- a/netwerk/protocol/http/nsAHttpConnection.h
+++ b/netwerk/protocol/http/nsAHttpConnection.h
@@ -197,12 +197,13 @@ public:
     {                                                       \
     if (fwdObject)                                          \
         return (fwdObject)->Classify(newclass);             \
     }                                                       \
     int64_t BytesWritten()                                  \
     {     return fwdObject ? (fwdObject)->BytesWritten() : 0; } \
     void SetSecurityCallbacks(nsIInterfaceRequestor* aCallbacks) \
     {                                                       \
-        (fwdObject)->SetSecurityCallbacks(aCallbacks); \
+        if (fwdObject)                                      \
+            (fwdObject)->SetSecurityCallbacks(aCallbacks);  \
     }
 
 #endif // nsAHttpConnection_h__