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

[darin]

The following commit has been merged in the debian/unstable branch:
commit 18f333360cefe57eefa8e4d4dd4442b2a1a1b88b
Author: darin <darin at 268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Wed Jul 24 07:19:25 2002 +0000

    	- 3006336 -- crash in _NSDescriptionWithLocaleFunc
    
            * kwq/KWQKHTMLPartImpl.mm: (KWQKHTMLPartImpl::overURL):
    	Don't use the result of getNSString() on a C++ temporary object.
    	We could also fix this by doing retain autorelease in getNSString().
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@1650 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebCore/ChangeLog-2002-12-03 b/WebCore/ChangeLog-2002-12-03
index f4b6824..d3dc395 100644
--- a/WebCore/ChangeLog-2002-12-03
+++ b/WebCore/ChangeLog-2002-12-03
@@ -1,6 +1,14 @@
+2002-07-24  Darin Adler  <darin at apple.com>
+
+	- 3006336 -- crash in _NSDescriptionWithLocaleFunc
+
+        * kwq/KWQKHTMLPartImpl.mm: (KWQKHTMLPartImpl::overURL):
+	Don't use the result of getNSString() on a C++ temporary object.
+	We could also fix this by doing retain autorelease in getNSString().
+
 2002-07-23  Chris Blumenberg  <cblu at apple.com>
 
-More plumbing for contextual menu support.
+	More plumbing for contextual menu support.
 
         * kwq/WebCoreBridge.h:
         * kwq/WebCoreBridge.mm:
diff --git a/WebCore/ChangeLog-2003-10-25 b/WebCore/ChangeLog-2003-10-25
index f4b6824..d3dc395 100644
--- a/WebCore/ChangeLog-2003-10-25
+++ b/WebCore/ChangeLog-2003-10-25
@@ -1,6 +1,14 @@
+2002-07-24  Darin Adler  <darin at apple.com>
+
+	- 3006336 -- crash in _NSDescriptionWithLocaleFunc
+
+        * kwq/KWQKHTMLPartImpl.mm: (KWQKHTMLPartImpl::overURL):
+	Don't use the result of getNSString() on a C++ temporary object.
+	We could also fix this by doing retain autorelease in getNSString().
+
 2002-07-23  Chris Blumenberg  <cblu at apple.com>
 
-More plumbing for contextual menu support.
+	More plumbing for contextual menu support.
 
         * kwq/WebCoreBridge.h:
         * kwq/WebCoreBridge.mm:
diff --git a/WebCore/ChangeLog-2005-08-23 b/WebCore/ChangeLog-2005-08-23
index f4b6824..d3dc395 100644
--- a/WebCore/ChangeLog-2005-08-23
+++ b/WebCore/ChangeLog-2005-08-23
@@ -1,6 +1,14 @@
+2002-07-24  Darin Adler  <darin at apple.com>
+
+	- 3006336 -- crash in _NSDescriptionWithLocaleFunc
+
+        * kwq/KWQKHTMLPartImpl.mm: (KWQKHTMLPartImpl::overURL):
+	Don't use the result of getNSString() on a C++ temporary object.
+	We could also fix this by doing retain autorelease in getNSString().
+
 2002-07-23  Chris Blumenberg  <cblu at apple.com>
 
-More plumbing for contextual menu support.
+	More plumbing for contextual menu support.
 
         * kwq/WebCoreBridge.h:
         * kwq/WebCoreBridge.mm:
diff --git a/WebCore/kwq/KWQKHTMLPart.mm b/WebCore/kwq/KWQKHTMLPart.mm
index dfa9331..218d97f 100644
--- a/WebCore/kwq/KWQKHTMLPart.mm
+++ b/WebCore/kwq/KWQKHTMLPart.mm
@@ -676,14 +676,12 @@ void KWQKHTMLPartImpl::overURL( const QString &url, const QString &target, int m
 
   NSString *message;
 
-  if (url.find(QString::fromLatin1("javascript:"), 0, false) != -1) {
-      // FIXME: Is it worthwhile to special-case scripts that do a
-      // window.open and nothing else?
-      
-      NSString *script = url.mid(url.find("javascript:", 0, false) + strlen("javascript:")).getNSString();
-      // FIXME: should use curly quotes
-      message = [NSString stringWithFormat:@"Run script \"%@\"", script];
-
+  // FIXME: This would do strange things with a link that said "xjavascript:".
+  int position = url.find("javascript:", 0, false);
+  if (position != -1) {
+      // FIXME: Is it worthwhile to special-case scripts that do a window.open and nothing else?
+      const QString scriptName = url.mid(position + strlen("javascript:"));
+      message = [NSString stringWithFormat:@"Run script \"%@\"", scriptName.getNSString()];
       setStatusBarText(QString::fromNSString(message));
       return;
   }
@@ -710,10 +708,8 @@ void KWQKHTMLPartImpl::overURL( const QString &url, const QString &target, int m
       if (frameExists(target)) {
 	  // FIXME: distinguish existing frame in same window from
 	  // existing frame name for other window
-	  // FIXME: should use curly quotes
           format = @"Go to \"%@\" in another frame";
       } else {
-	  // FIXME: should use curly quotes
 	  format = @"Open \"%@\" in a new window";
       }
   } else {
@@ -723,14 +719,11 @@ void KWQKHTMLPartImpl::overURL( const QString &url, const QString &target, int m
   if ([bridge modifierTrackingEnabled]) {
       if (modifierState & MetaButton) {
 	  if (modifierState & ShiftButton) {
-	      // FIXME: should use curly quotes
 	      format = @"Open \"%@\" in a new window, behind the current window";
 	  } else {
-	      // FIXME: should use curly quotes
 	      format = @"Open \"%@\" in a new window";
 	  }
       } else if (modifierState & AltButton) {
-	  // FIXME: should use curly quotes
 	  format = @"Download \"%@\"";
       }
   }
diff --git a/WebCore/kwq/KWQKHTMLPartImpl.mm b/WebCore/kwq/KWQKHTMLPartImpl.mm
index dfa9331..218d97f 100644
--- a/WebCore/kwq/KWQKHTMLPartImpl.mm
+++ b/WebCore/kwq/KWQKHTMLPartImpl.mm
@@ -676,14 +676,12 @@ void KWQKHTMLPartImpl::overURL( const QString &url, const QString &target, int m
 
   NSString *message;
 
-  if (url.find(QString::fromLatin1("javascript:"), 0, false) != -1) {
-      // FIXME: Is it worthwhile to special-case scripts that do a
-      // window.open and nothing else?
-      
-      NSString *script = url.mid(url.find("javascript:", 0, false) + strlen("javascript:")).getNSString();
-      // FIXME: should use curly quotes
-      message = [NSString stringWithFormat:@"Run script \"%@\"", script];
-
+  // FIXME: This would do strange things with a link that said "xjavascript:".
+  int position = url.find("javascript:", 0, false);
+  if (position != -1) {
+      // FIXME: Is it worthwhile to special-case scripts that do a window.open and nothing else?
+      const QString scriptName = url.mid(position + strlen("javascript:"));
+      message = [NSString stringWithFormat:@"Run script \"%@\"", scriptName.getNSString()];
       setStatusBarText(QString::fromNSString(message));
       return;
   }
@@ -710,10 +708,8 @@ void KWQKHTMLPartImpl::overURL( const QString &url, const QString &target, int m
       if (frameExists(target)) {
 	  // FIXME: distinguish existing frame in same window from
 	  // existing frame name for other window
-	  // FIXME: should use curly quotes
           format = @"Go to \"%@\" in another frame";
       } else {
-	  // FIXME: should use curly quotes
 	  format = @"Open \"%@\" in a new window";
       }
   } else {
@@ -723,14 +719,11 @@ void KWQKHTMLPartImpl::overURL( const QString &url, const QString &target, int m
   if ([bridge modifierTrackingEnabled]) {
       if (modifierState & MetaButton) {
 	  if (modifierState & ShiftButton) {
-	      // FIXME: should use curly quotes
 	      format = @"Open \"%@\" in a new window, behind the current window";
 	  } else {
-	      // FIXME: should use curly quotes
 	      format = @"Open \"%@\" in a new window";
 	  }
       } else if (modifierState & AltButton) {
-	  // FIXME: should use curly quotes
 	  format = @"Download \"%@\"";
       }
   }

-- 
WebKit Debian packaging