Bug 1265093: Silence CID 1358535. r?gerald draft
authorJean-Yves Avenard <jyavenard@mozilla.com>
Wed, 20 Apr 2016 16:07:16 +1000
changeset 354133 d23568d5b2207caf5eb7c9894439395c6854f4c1
parent 354132 34f5a7144be34c3f48ebfeb4cbe3bd38419c0c7c
child 354179 7de36749c1286d106c98a00f3decb2d45384fdee
push id15980
push userbmo:jyavenard@mozilla.com
push dateWed, 20 Apr 2016 06:09:09 +0000
reviewersgerald
bugs1265093, 1358535
milestone48.0a1
Bug 1265093: Silence CID 1358535. r?gerald It was a false positive, has mData can only be null if mLength is also 0. MozReview-Commit-ID: LcPtn49ew6e
dom/media/MediaData.h
--- a/dom/media/MediaData.h
+++ b/dom/media/MediaData.h
@@ -235,18 +235,22 @@ private:
     }
 
     // Find alignment address.
     const uintptr_t alignmask = AlignmentOffset();
     Type* newData = reinterpret_cast<Type*>(
       (reinterpret_cast<uintptr_t>(newBuffer.get()) + alignmask) & ~alignmask);
     MOZ_ASSERT(uintptr_t(newData) % (AlignmentOffset()+1) == 0);
 
+    MOZ_ASSERT(!mLength || mData);
+
     PodZero(newData + mLength, aLength - mLength);
-    PodCopy(newData, mData, mLength);
+    if (mLength) {
+      PodCopy(newData, mData, mLength);
+    }
 
     mBuffer = Move(newBuffer);
     mCapacity = sizeNeeded.value();
     mData = newData;
 
     return true;
   }
   Type* mData;