Merge pull request #506 from redboltz/fix_494_user_class

Fixed #494.
Fixed #494 .
2025-10-21 07:45:02 +02:00 · 2016-07-22 20:21:11 +09:00 · 2016-07-22 16:00:50 +09:00 · 2016-07-05 17:17:59 +09:00 · 2016-06-30 21:59:12 +09:00 · 2016-05-27 18:08:08 +09:00
7 changed files with 28 additions and 2 deletions
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,3 +1,6 @@
+# 2016-05-26 version 1.4.2
+  * Fix C++03 msgpack::zone::clear() memory access violation bug (#467)
+
 # 2016-03-06 version 1.4.1

  * Fix TARGET_OS_IPHONE checking (#436, #438)
--- a/README.md
+++ b/README.md
@@ -1,7 +1,7 @@
 `msgpack` for C/C++
 ===================

-Version 1.4.1 [![Build Status](https://travis-ci.org/msgpack/msgpack-c.svg?branch=master)](https://travis-ci.org/msgpack/msgpack-c) [![Build status](https://ci.appveyor.com/api/projects/status/8kstcgt79qj123mw/branch/master?svg=true)](https://ci.appveyor.com/project/redboltz/msgpack-c/branch/master)
+Version 1.4.2 [![Build Status](https://travis-ci.org/msgpack/msgpack-c.svg?branch=master)](https://travis-ci.org/msgpack/msgpack-c) [![Build status](https://ci.appveyor.com/api/projects/status/8kstcgt79qj123mw/branch/master?svg=true)](https://ci.appveyor.com/project/redboltz/msgpack-c/branch/master)

 It's like JSON but small and fast.

--- a/erb/cpp03_zone.hpp.erb
+++ b/erb/cpp03_zone.hpp.erb
@@ -125,6 +125,7 @@ class zone {
                    ::free(c);
                    c = n;
                } else {
+                    m_head = c;
                    break;
                }
            }
--- a/include/msgpack/detail/cpp03_zone.hpp
+++ b/include/msgpack/detail/cpp03_zone.hpp
@@ -125,6 +125,7 @@ class zone {
                    ::free(c);
                    c = n;
                } else {
+                    m_head = c;
                    break;
                }
            }
--- a/include/msgpack/version_master.h
+++ b/include/msgpack/version_master.h
@@ -1,3 +1,3 @@
 #define MSGPACK_VERSION_MAJOR    1
 #define MSGPACK_VERSION_MINOR    4
-#define MSGPACK_VERSION_REVISION 1
+#define MSGPACK_VERSION_REVISION 2
--- a/test/object_with_zone.cpp
+++ b/test/object_with_zone.cpp
@@ -742,7 +742,14 @@ TEST(object_with_zone, user_defined_non_virtual)

    msgpack::zone z;
    msgpack::object obj(b, z);
+#if (__GNUC__ > 4 || (__GNUC__ == 4 && __GNUC_MINOR__ >= 6)) && !defined(__clang__)
+#pragma GCC diagnostic push
+#pragma GCC diagnostic ignored "-Wmaybe-uninitialized"
+#endif // (__GNUC__ > 4 || (__GNUC__ == 4 && __GNUC_MINOR__ >= 6)) && !defined(__clang__)
    bottom br = obj.as<bottom>();
+#if (__GNUC__ > 4 || (__GNUC__ == 4 && __GNUC_MINOR__ >= 6)) && !defined(__clang__)
+#pragma GCC diagnostic pop
+#endif // (__GNUC__ > 4 || (__GNUC__ == 4 && __GNUC_MINOR__ >= 6)) && !defined(__clang__)
    EXPECT_EQ(b.b, br.b);
    EXPECT_EQ(b.m1, br.m1);
    EXPECT_EQ(b.m2, br.m2);
@@ -780,7 +787,14 @@ TEST(object_with_zone, user_defined_virtual)

    msgpack::zone z;
    msgpack::object obj(b, z);
+#if (__GNUC__ > 4 || (__GNUC__ == 4 && __GNUC_MINOR__ >= 6)) && !defined(__clang__)
+#pragma GCC diagnostic push
+#pragma GCC diagnostic ignored "-Wmaybe-uninitialized"
+#endif // (__GNUC__ > 4 || (__GNUC__ == 4 && __GNUC_MINOR__ >= 6)) && !defined(__clang__)
    v_bottom br = obj.as<v_bottom>();
+#if (__GNUC__ > 4 || (__GNUC__ == 4 && __GNUC_MINOR__ >= 6)) && !defined(__clang__)
+#pragma GCC diagnostic pop
+#endif // (__GNUC__ > 4 || (__GNUC__ == 4 && __GNUC_MINOR__ >= 6)) && !defined(__clang__)
    EXPECT_EQ(b.b, br.b);
    EXPECT_EQ(b.m1, br.m1);
    EXPECT_EQ(b.m2, br.m2);
--- a/test/user_class.cpp
+++ b/test/user_class.cpp
@@ -382,7 +382,14 @@ TEST(MSGPACK_INHERIT, define_map_non_virtual)
    msgpack::pack(sbuf, b);
    msgpack::unpacked ret;
    msgpack::unpack(ret, sbuf.data(), sbuf.size());
+#if (__GNUC__ > 4 || (__GNUC__ == 4 && __GNUC_MINOR__ >= 6)) && !defined(__clang__)
+#pragma GCC diagnostic push
+#pragma GCC diagnostic ignored "-Wmaybe-uninitialized"
+#endif // (__GNUC__ > 4 || (__GNUC__ == 4 && __GNUC_MINOR__ >= 6)) && !defined(__clang__)
    dm_bottom br = ret.get().as<dm_bottom>();
+#if (__GNUC__ > 4 || (__GNUC__ == 4 && __GNUC_MINOR__ >= 6)) && !defined(__clang__)
+#pragma GCC diagnostic pop
+#endif // (__GNUC__ > 4 || (__GNUC__ == 4 && __GNUC_MINOR__ >= 6)) && !defined(__clang__)
    EXPECT_EQ(b.b, br.b);
    EXPECT_EQ(b.m1, br.m1);
    EXPECT_EQ(b.m2, br.m2);
Author	SHA1	Message	Date
Takatoshi Kondo	b03902d93b	Merge pull request #506 from redboltz/fix_494_user_class Fixed #494.	2016-07-22 20:21:11 +09:00
Takatoshi Kondo	8a2be5b4e9	Fixed #494 . Added false positive warinig suppression code for user_class.cpp.	2016-07-22 16:00:50 +09:00
Takatoshi Kondo	010acda932	Merge pull request #495 from redboltz/fix_494 Fixed #494	2016-07-05 17:17:59 +09:00
Takatoshi Kondo	c951f58531	Fixed #494 Added warning supression code.	2016-06-30 21:59:12 +09:00
Takatoshi Kondo	e59f6e67a5	Merge pull request #468 from redboltz/ver1.4.2 Updated version number.	2016-05-27 18:08:08 +09:00
Takatoshi Kondo	9a8405bcd7	Updated change log and readme.	2016-05-26 20:27:08 +09:00
Takatoshi Kondo	9eca5a9ff6	Updated version number.	2016-05-26 19:50:07 +09:00
Takatoshi Kondo	8388ced33f	Merge pull request #467 from redboltz/bp_441 Backported #441 to cpp-1.4.	2016-05-18 21:59:17 +09:00
Takatoshi Kondo	0dcab0b2b1	Backported #441 to cpp-1.4. Fixed a pointer operation problem at msgpack::zone::chunk_list::clear(). It was only happened on C++03.	2016-05-18 19:21:52 +09:00