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

trey trey at 268f45cc-cd09-0410-ab3c-d52691b4dbfc
Sat Sep 26 07:19:02 UTC 2009


The following commit has been merged in the debian/unstable branch:
commit 38b5508b30d15750a35307e820d0504512f880fb
Author: trey <trey at 268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Fri Jan 10 01:04:59 2003 +0000

    WebKit:
    
    	3143294 - need short-term bulletproofing of download code against bad filenames
    
    	We protect against a download location that is not an absolute path.
    
            Reviewed by Darin
    
            * WebView.subproj/WebMainResourceClient.m:
            (-[WebMainResourceClient continueAfterContentPolicy:response:]):
    	Bail on download if we don't have a abs path to write to.
    
    WebBrowser:
    
    	3143294 - need short-term bulletproofing of download code against bad filenames
    
    	We protect against slashes and leading periods, as well as handling empty filenames.
    
            Reviewed by Darin
    
            * BrowserWebController.m:
            (-[BrowserWebController saveFilenameForResponse:andRequest:]):
    	Check results of [response filename] carefully
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@3287 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebKit/ChangeLog b/WebKit/ChangeLog
index f25bb90..c33c705 100644
--- a/WebKit/ChangeLog
+++ b/WebKit/ChangeLog
@@ -1,3 +1,15 @@
+2003-01-09  Trey Matteson  <trey at apple.com>
+
+	3143294 - need short-term bulletproofing of download code against bad filenames
+
+	We protect against a download location that is not an absolute path.
+
+        Reviewed by Darin
+
+        * WebView.subproj/WebMainResourceClient.m:
+        (-[WebMainResourceClient continueAfterContentPolicy:response:]):
+	Bail on download if we don't have a abs path to write to.
+
 2003-01-08  Trey Matteson  <trey at apple.com>
 
 	3142201 - home directory nuked during power download session
diff --git a/WebKit/WebView.subproj/WebMainResourceClient.m b/WebKit/WebView.subproj/WebMainResourceClient.m
index 7ce09fd..436d388 100644
--- a/WebKit/WebView.subproj/WebMainResourceClient.m
+++ b/WebKit/WebView.subproj/WebMainResourceClient.m
@@ -196,7 +196,7 @@
 	    NSString *saveFilename = [[[dataSource controller] policyDelegate]
                 saveFilenameForResponse:r andRequest:req];
             // FIXME: Maybe there a cleaner way handle the bad filename case?
-            if(!saveFilename || [saveFilename length] == 0){
+            if(!saveFilename || [saveFilename length] == 0 || ![saveFilename isAbsolutePath]){
                 ERROR("Nil or empty response to saveFilenameForResponse:andRequest:.");
                 [self stopLoadingForPolicyChange];
                 return;
diff --git a/WebKit/WebView.subproj/WebMainResourceLoader.m b/WebKit/WebView.subproj/WebMainResourceLoader.m
index 7ce09fd..436d388 100644
--- a/WebKit/WebView.subproj/WebMainResourceLoader.m
+++ b/WebKit/WebView.subproj/WebMainResourceLoader.m
@@ -196,7 +196,7 @@
 	    NSString *saveFilename = [[[dataSource controller] policyDelegate]
                 saveFilenameForResponse:r andRequest:req];
             // FIXME: Maybe there a cleaner way handle the bad filename case?
-            if(!saveFilename || [saveFilename length] == 0){
+            if(!saveFilename || [saveFilename length] == 0 || ![saveFilename isAbsolutePath]){
                 ERROR("Nil or empty response to saveFilenameForResponse:andRequest:.");
                 [self stopLoadingForPolicyChange];
                 return;

-- 
WebKit Debian packaging



More information about the Pkg-webkit-commits mailing list