From 725202356bea1c7dec2a3bdeb026b0ad9eab4f88 Mon Sep 17 00:00:00 2001
From: Niels <niels.lohmann@gmail.com>
Date: Mon, 29 Dec 2014 12:51:20 +0100
Subject: [PATCH] + fix memory issues
---
.gitignore | 2 ++
src/JSON.cc | 6 +++++-
2 files changed, 7 insertions(+), 1 deletion(-)
diff --git a/.gitignore b/.gitignore
index fd0fe797..81f91882 100644
--- a/.gitignore
+++ b/.gitignore
@@ -32,3 +32,5 @@ missing
test-driver
Makefile.in
+
+*.plist
diff --git a/src/JSON.cc b/src/JSON.cc
index 062da5be..908ff197 100644
--- a/src/JSON.cc
+++ b/src/JSON.cc
@@ -162,7 +162,7 @@ JSON::JSON(list_init_t a) noexcept
// the initializer list describes an array
_type = value_type::array;
- _value = new array_t(std::move(a));
+ _value = new array_t(a);
return;
}
}
@@ -684,6 +684,8 @@ void JSON::push_back(JSON&& o)
// add element to array (move semantics)
_value.array->emplace_back(std::move(o));
+ // invalidate object
+ o._type = value_type::null;
}
void JSON::push_back(const std::string& s)
@@ -1188,6 +1190,7 @@ JSON::iterator JSON::find(const char* key)
if (i != _value.object->end())
{
JSON::iterator result(this);
+ delete result._oi;
result._oi = new object_t::iterator(i);
return result;
}
@@ -1210,6 +1213,7 @@ JSON::const_iterator JSON::find(const char* key) const
if (i != _value.object->end())
{
JSON::const_iterator result(this);
+ delete result._oi;
result._oi = new object_t::const_iterator(i);
return result;
}