X-Git-Url: https://git.saurik.com/apple/javascriptcore.git/blobdiff_plain/cb9aa2694aba0ae4f946ed34b8e0f6c99c1cfe44..ef99ff287df9046eb88937225e0554eabb00e33c:/ChangeLog

diff --git a/ChangeLog b/ChangeLog
index 35c65f4..bbda15d 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,22 @@
+2014-12-10  Babak Shafiei  <bshafiei@apple.com>
+
+        Merge r176803.
+
+    2014-12-04  Oliver Hunt  <oliver@apple.com>
+
+            Serialization of MapData object provides unsafe access to internal types
+            https://bugs.webkit.org/show_bug.cgi?id=138653
+
+            Reviewed by Geoffrey Garen.
+
+            Converting these ASSERTs into RELEASE_ASSERTs, as it is now obvious
+            that despite trying hard to be safe in all cases it's simply to easy
+            to use an iterator in an unsafe state.
+
+            * runtime/MapData.h:
+            (JSC::MapData::const_iterator::key):
+            (JSC::MapData::const_iterator::value):
+
 2014-09-15  Babak Shafiei  <bshafiei@apple.com>
 
         <rdar://problem/18327341> Disable Web Timing on this branch.