From: Mark Slee <mcslee@apache.org>
Date: Wed, 21 Nov 2007 22:05:50 +0000 (+0000)
Subject: Double-free Cocoa fix: Redux
X-Git-Tag: 0.2.0~1110
X-Git-Url: https://source.supwisdom.com/gerrit/gitweb?a=commitdiff_plain;h=a9387af56ee5dd6fe601ac59f62a553b64e0eb49;p=common%2Fthrift.git

Double-free Cocoa fix: Redux

Summary: Need get_true_type to evaluate string status

Reviewed By: mcslee

Other Notes: Submission from Andrew McGeachie


git-svn-id: https://svn.apache.org/repos/asf/incubator/thrift/trunk@665362 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 9ade7fdb..fc853658 100644
--- a/compiler/cpp/src/generate/t_cocoa_generator.cc
+++ b/compiler/cpp/src/generate/t_cocoa_generator.cc
@@ -486,7 +486,7 @@ void t_cocoa_generator::generate_cocoa_struct_reader(ofstream& out,
         // is now retaining it
         if (type_can_be_null((*f_iter)->get_type())) {
           // deserialized strings are autorelease, so don't release them
-          if (!((*f_iter)->get_type()->is_string())) {
+          if (!(get_true_type((*f_iter)->get_type())->is_string())) {
             indent(out) << "[fieldValue release];" << endl;
           }
         }