From: Andrew McGeachie <geechorama@apache.org>
Date: Tue, 21 Jul 2009 20:14:31 +0000 (+0000)
Subject: THRIFT-59.  Make sure we don't over-release strings after we deserialize them.
X-Git-Tag: 0.2.0~64
X-Git-Url: https://source.supwisdom.com/gerrit/gitweb?a=commitdiff_plain;h=6efefc023aeb48db6b6ac875bd35b2e895d8311a;p=common%2Fthrift.git

THRIFT-59.  Make sure we don't over-release strings after we deserialize them.

git-svn-id: https://svn.apache.org/repos/asf/incubator/thrift/trunk@796518 13f79535-47bb-0310-9956-ffa450edef68
---

diff --git a/compiler/cpp/src/generate/t_cocoa_generator.cc b/compiler/cpp/src/generate/t_cocoa_generator.cc
index fab0c546..b815ce0d 100644
--- a/compiler/cpp/src/generate/t_cocoa_generator.cc
+++ b/compiler/cpp/src/generate/t_cocoa_generator.cc
@@ -1486,11 +1486,15 @@ void t_cocoa_generator::generate_deserialize_map_element(ofstream& out,
     " forKey: " << containerize(keyType, key) << "];" << endl;
 
   if (type_can_be_null(keyType)) {
-    indent(out) << "[" << containerize(keyType, key) << " release];" << endl;
+    if (!(get_true_type(keyType)->is_string())) {
+      indent(out) << "[" << containerize(keyType, key) << " release];" << endl;
+    }
   }
 
   if (type_can_be_null(valType)) {
-    indent(out) << "[" << containerize(valType, val) << " release];" << endl;
+    if (!(get_true_type(valType)->is_string())) {
+      indent(out) << "[" << containerize(valType, val) << " release];" << endl;
+    }
   }
 }
 
@@ -1510,7 +1514,10 @@ void t_cocoa_generator::generate_deserialize_set_element(ofstream& out,
     "[" << fieldName << " addObject: " << containerize(type, elem) << "];" << endl;
 
   if (type_can_be_null(type)) {
-    indent(out) << "[" << containerize(type, elem) << " release];" << endl;
+    // deserialized strings are autorelease, so don't release them
+    if (!(get_true_type(type)->is_string())) {
+      indent(out) << "[" << containerize(type, elem) << " release];" << endl;
+    }
   }
 }
 
@@ -1530,7 +1537,9 @@ void t_cocoa_generator::generate_deserialize_list_element(ofstream& out,
     "[" << fieldName << " addObject: " << containerize(type, elem) << "];" << endl;
 
   if (type_can_be_null(type)) {
-    indent(out) << "[" << containerize(type, elem) << " release];" << endl;
+    if (!(get_true_type(type)->is_string())) {
+      indent(out) << "[" << containerize(type, elem) << " release];" << endl;
+    }
   }
 }