Fix refcount crash with find again. (bug 150532)

camino/FindDlgController.h

@@ -50,6 +50,7 @@
 
 -(IBAction) find: (id)aSender;
 -(IBAction) findAgain: (id)aSender;
+-(void) storeSearchText:(NSString*)inText;
 
   // delegates for NSTextView
 - (void)controlTextDidChange:(NSNotification *)aNotification;

camino/FindDlgController.mm

@@ -42,12 +42,23 @@
 
 @implementation FindDlgController
 
+- (id)initWithWindowNibName:(NSString *)windowNibName
+{
+  if ( (self = [super initWithWindowNibName:windowNibName]) )
+    mSearchText = nil;
+  return self;
+}
+
+- (void)dealloc
+{
+  [mSearchText release];
+}
+
 - (void)windowDidLoad
 {
 }
 
 
-
 //
 // -find
 //
@@ -59,7 +70,7 @@
   NSWindowController* controller = [[NSApp mainWindow] windowController];
   if ( [controller conformsToProtocol:@protocol(CHFind)] ) {
     id<CHFind> browserController = controller;
-    mSearchText = [mSearchField stringValue];
+    [self storeSearchText:[mSearchField stringValue]];
     BOOL found = [browserController findInPage:mSearchText];
     if ( found ) 
       [self close];
@@ -104,4 +115,11 @@
     [mFindButton setEnabled:PR_FALSE];    
 }
 
+
+- (void)storeSearchText:(NSString*)inText
+{
+  [mSearchText autorelease];
+  mSearchText = inText;
+  [mSearchText retain];
+}
 @end

camino/src/find/FindDlgController.h

@@ -50,6 +50,7 @@
 
 -(IBAction) find: (id)aSender;
 -(IBAction) findAgain: (id)aSender;
+-(void) storeSearchText:(NSString*)inText;
 
   // delegates for NSTextView
 - (void)controlTextDidChange:(NSNotification *)aNotification;

camino/src/find/FindDlgController.mm

@@ -42,12 +42,23 @@
 
 @implementation FindDlgController
 
+- (id)initWithWindowNibName:(NSString *)windowNibName
+{
+  if ( (self = [super initWithWindowNibName:windowNibName]) )
+    mSearchText = nil;
+  return self;
+}
+
+- (void)dealloc
+{
+  [mSearchText release];
+}
+
 - (void)windowDidLoad
 {
 }
 
 
-
 //
 // -find
 //
@@ -59,7 +70,7 @@
   NSWindowController* controller = [[NSApp mainWindow] windowController];
   if ( [controller conformsToProtocol:@protocol(CHFind)] ) {
     id<CHFind> browserController = controller;
-    mSearchText = [mSearchField stringValue];
+    [self storeSearchText:[mSearchField stringValue]];
     BOOL found = [browserController findInPage:mSearchText];
     if ( found ) 
       [self close];
@@ -104,4 +115,11 @@
     [mFindButton setEnabled:PR_FALSE];    
 }
 
+
+- (void)storeSearchText:(NSString*)inText
+{
+  [mSearchText autorelease];
+  mSearchText = inText;
+  [mSearchText retain];
+}
 @end

chimera/FindDlgController.h

@@ -50,6 +50,7 @@
 
 -(IBAction) find: (id)aSender;
 -(IBAction) findAgain: (id)aSender;
+-(void) storeSearchText:(NSString*)inText;
 
   // delegates for NSTextView
 - (void)controlTextDidChange:(NSNotification *)aNotification;

chimera/FindDlgController.mm

@@ -42,12 +42,23 @@
 
 @implementation FindDlgController
 
+- (id)initWithWindowNibName:(NSString *)windowNibName
+{
+  if ( (self = [super initWithWindowNibName:windowNibName]) )
+    mSearchText = nil;
+  return self;
+}
+
+- (void)dealloc
+{
+  [mSearchText release];
+}
+
 - (void)windowDidLoad
 {
 }
 
 
-
 //
 // -find
 //
@@ -59,7 +70,7 @@
   NSWindowController* controller = [[NSApp mainWindow] windowController];
   if ( [controller conformsToProtocol:@protocol(CHFind)] ) {
     id<CHFind> browserController = controller;
-    mSearchText = [mSearchField stringValue];
+    [self storeSearchText:[mSearchField stringValue]];
     BOOL found = [browserController findInPage:mSearchText];
     if ( found ) 
       [self close];
@@ -104,4 +115,11 @@
     [mFindButton setEnabled:PR_FALSE];    
 }
 
+
+- (void)storeSearchText:(NSString*)inText
+{
+  [mSearchText autorelease];
+  mSearchText = inText;
+  [mSearchText retain];
+}
 @end

chimera/src/find/FindDlgController.h

@@ -50,6 +50,7 @@
 
 -(IBAction) find: (id)aSender;
 -(IBAction) findAgain: (id)aSender;
+-(void) storeSearchText:(NSString*)inText;
 
   // delegates for NSTextView
 - (void)controlTextDidChange:(NSNotification *)aNotification;

chimera/src/find/FindDlgController.mm

@@ -42,12 +42,23 @@
 
 @implementation FindDlgController
 
+- (id)initWithWindowNibName:(NSString *)windowNibName
+{
+  if ( (self = [super initWithWindowNibName:windowNibName]) )
+    mSearchText = nil;
+  return self;
+}
+
+- (void)dealloc
+{
+  [mSearchText release];
+}
+
 - (void)windowDidLoad
 {
 }
 
 
-
 //
 // -find
 //
@@ -59,7 +70,7 @@
   NSWindowController* controller = [[NSApp mainWindow] windowController];
   if ( [controller conformsToProtocol:@protocol(CHFind)] ) {
     id<CHFind> browserController = controller;
-    mSearchText = [mSearchField stringValue];
+    [self storeSearchText:[mSearchField stringValue]];
     BOOL found = [browserController findInPage:mSearchText];
     if ( found ) 
       [self close];
@@ -104,4 +115,11 @@
     [mFindButton setEnabled:PR_FALSE];    
 }
 
+
+- (void)storeSearchText:(NSString*)inText
+{
+  [mSearchText autorelease];
+  mSearchText = inText;
+  [mSearchText retain];
+}
 @end