commit 4588e6e2b98671d544f7f2bb7372710beb7bdfcb
author Thomas Van Lenten <thomasvl@google.com> Wed Jan 03 13:06:26 2018 -0500
committer Thomas Van Lenten <thomasvl@google.com> Wed Jan 03 13:12:29 2018 -0500
tree ddcda8503a97a19aa3975d9b5a45b7a20542c235
parent 43caa38d6ed68129d28bf4528488e4f389a33b34

Force a copy when saving the NSData that came from another.

objectivec/GPBMessage.m

diff --git a/objectivec/GPBMessage.m b/objectivec/GPBMessage.m
index 3be20b6..cc1a650 100644
--- a/objectivec/GPBMessage.m
+++ b/objectivec/GPBMessage.m
@@ -2027,7 +2027,12 @@
       [newInput release];
     } else {
       GPBUnknownFieldSet *unknownFields = GetOrMakeUnknownFields(self);
-      [unknownFields mergeMessageSetMessage:typeId data:rawBytes];
+      // rawBytes was created via a NoCopy, so it can be reusing a
+      // subrange of another NSData that might go out of scope as things
+      // unwind, so a copy is needed to ensure what is saved in the
+      // unknown fields stays valid.
+      NSData *cloned = [NSData dataWithData:rawBytes];
+      [unknownFields mergeMessageSetMessage:typeId data:cloned];
     }
   }
 }