From bdf29657e5e5a51d2282e3de7a766f3b17c7fa58 Mon Sep 17 00:00:00 2001
From: rfm <rfm@72102866-910b-0410-8b05-ffd578937521>
Date: Wed, 27 Jun 2012 18:12:12 +0000
Subject: [PATCH] fix for memory leak

git-svn-id: svn+ssh://svn.gna.org/svn/gnustep/libs/base/trunk@35242 72102866-910b-0410-8b05-ffd578937521
---
 ChangeLog          | 7 ++++++-
 Source/NSScanner.m | 2 +-
 2 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 9f36c4fe3..ef0113956 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,6 +1,11 @@
+2012-06-27  Richard Frith-Macdonald <rfm@gnu.org>
+
+        * Source/NSScanner.m: Fix missing 'else' which was causing a
+        memory leak and minor performance degradation.
+
 2012-06-12  Richard Frith-Macdonald <rfm@gnu.org>
 
-        * NSPropertyList.m: Check for nil property list argument.
+        * Source/NSPropertyList.m: Check for nil property list argument.
 
 2012-06-07  Wolfgang Lux  <wolfgang.lux@gmail.com>
 
diff --git a/Source/NSScanner.m b/Source/NSScanner.m
index 301923301..7c6ffc553 100644
--- a/Source/NSScanner.m
+++ b/Source/NSScanner.m
@@ -205,7 +205,7 @@ typedef GSString	*ivars;
     {
       _string = [_holder initWithString: aString];
     }
-  if (GSObjCIsKindOf(c, GSUnicodeStringClass) == YES)
+  else if (GSObjCIsKindOf(c, GSUnicodeStringClass) == YES)
     {
       _string = RETAIN(aString);
     }