mozilla-central: changeset 131947:1be2d9024641e4272e6c155e115f0636139c6e9b

author	Steve Workman <sworkman@mozilla.com>
	Tue, 14 May 2013 16:35:18 -0700
changeset 131947	1be2d9024641e4272e6c155e115f0636139c6e9b
parent 131946	c4f374baea0ab471d360493da85051f3920e5696
child 131948	d63027c3baa8caba04384b56d41293e61b1ebc1e
push id	24678
push user	ryanvm@gmail.com
push date	Thu, 16 May 2013 01:15:09 +0000
treeherder	mozilla-central@19cc1efe8097 [default view] [failures only]
perfherder	[talos] [build metrics] [platform microbench] (compared to previous push)
reviewers	mcmanus
bugs	870652
milestone	24.0a1
first release with	nightly linux32 cc139752bed4 / 24.0a1 / 20130516031004 / files nightly linux64 cc139752bed4 / 24.0a1 / 20130516031004 / files nightly mac cc139752bed4 / 24.0a1 / 20130516031004 / files nightly win32 cc139752bed4 / 24.0a1 / 20130516031004 / files nightly win64 26cb30a532a1 / 24.0a1 / 20130519031035 / files
last release without	nightly linux32 26ab72bfa9df / 24.0a1 / 20130515031027 / files nightly linux64 26ab72bfa9df / 24.0a1 / 20130515031027 / files nightly mac 26ab72bfa9df / 24.0a1 / 20130515031027 / files nightly win32 26ab72bfa9df / 24.0a1 / 20130515031027 / files nightly win64 26ab72bfa9df / 24.0a1 / 20130515031027 / files

--- a/netwerk/dns/nsDNSService2.cpp
+++ b/netwerk/dns/nsDNSService2.cpp
@@ -226,17 +226,18 @@ nsDNSRecord::ReportUnusable(uint16_t aPo
 
     MutexAutoLock lock(mHostRecord->addr_info_lock);
 
     // Check that we are using a real addr_info (as opposed to a single
     // constant address), and that the generation count is valid. Otherwise,
     // ignore the report.
 
     if (mHostRecord->addr_info &&
-        mIterGenCnt == mHostRecord->addr_info_gencnt) {
+        mIterGenCnt == mHostRecord->addr_info_gencnt &&
+        mIter) {
         mHostRecord->ReportUnusable(&mIter->mAddress);
     }
 
     return NS_OK;
 }
 
 //-----------------------------------------------------------------------------