[SCM] WebKit Debian packaging branch, debian/unstable, updated. debian/1.1.15-1-40151-g37bb677

[mjs]

The following commit has been merged in the debian/unstable branch:
commit 05ec916dc07904189fed1809f68abce26b0eb47c
Author: mjs <mjs at 268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Mon Sep 1 23:46:24 2003 +0000

            Reviewed by John.
    
    	- fixed 3401709 - [WebView searchFor:] with wrap:NO hangs if the search fails
    
            * WebView.subproj/WebView.m:
            (-[WebView searchFor:direction:caseSensitive:wrap:]): Fix for
    	wrap:NO case as suggested by Darin.
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@4922 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebKit/ChangeLog b/WebKit/ChangeLog
index 86df5eb..e52742a 100644
--- a/WebKit/ChangeLog
+++ b/WebKit/ChangeLog
@@ -1,3 +1,13 @@
+2003-08-30  Maciej Stachowiak  <mjs at apple.com>
+
+        Reviewed by John.
+
+	- fixed 3401709 - [WebView searchFor:] with wrap:NO hangs if the search fails
+	
+        * WebView.subproj/WebView.m:
+        (-[WebView searchFor:direction:caseSensitive:wrap:]): Fix for
+	wrap:NO case as suggested by Darin.
+
 === Safari-96 ===
 
 2003-08-29  Richard Williamson   <rjw at apple.com>
diff --git a/WebKit/WebView.subproj/WebView.m b/WebKit/WebView.subproj/WebView.m
index 737f99e..d011942 100644
--- a/WebKit/WebView.subproj/WebView.m
+++ b/WebKit/WebView.subproj/WebView.m
@@ -649,11 +649,11 @@ static WebFrame *incrementFrame(WebFrame *curr, BOOL forward, BOOL wrapFlag)
             }
         }
         frame = incrementFrame(frame, forward, wrapFlag);
-    } while (frame != startFrame);
+    } while (frame != nil && frame != startFrame);
 
     // Search contents of startFrame, on the other side of the selection that we did earlier.
     // We cheat a bit and just research with wrap on
-    if (startHasSelection && startSearchView) {
+    if (wrapFlag && startHasSelection && startSearchView) {
         BOOL success = [startSearchView searchFor:string direction:forward caseSensitive:caseFlag wrap:YES];
         if (success) {
             [[self window] makeFirstResponder:startSearchView];

-- 
WebKit Debian packaging