← Back to branch summary

~clint-fewbar/ubuntu/precise/php5/php5-5.4-merge

« back to all changes in this revision

Viewing changes to debian/patches/crash_in_zip_extract.patch

  • Committer: Package Import Robot
  • Author(s): Chuck Short
  • Date: 2011-02-22 09:46:37 UTC
  • mfrom: (1.1.20) (0.3.18 sid)
  • Revision ID: package-import@ubuntu.com-20110222094637-nlu2tvb7oqgaarl0
Tags: 5.3.5-1ubuntu1
* Merge from debian/unstable. Remaining changes:
 - debian/control:
    * Dropped firebird2.1-dev, libc-client-dev, libmcrypt-dev as it is in universe.
    * Dropped libmysqlclient15-dev, build against mysql 5.1.
    * Dropped libcurl-dev not in the archive.
    * Suggest php5-suhosin rather than recommends.
    * Dropped php5-imap, php5-interbase, php5-mcrypt since we have versions 
      already in universe.
    * Dropped libonig-dev and libqgdbm since its in universe. (will be re-added in lucid+1)
    * Dropped locales-all.
  - modulelist: Drop imap, interbase, sybase, and mcrypt.
  - debian/rules:
    * Dropped building of mcrypt, imap, and interbase.
    * Install apport hook for php5.
    * stop mysql instance on clean just in case we failed in tests

Show diffs side-by-side

added added

removed removed

Lines of Context:
debian/patches/crash_in_zip_extract.patch
1
 
--- a/ext/zip/php_zip.c
2
 
+++ b/ext/zip/php_zip.c
3
 
@@ -162,6 +162,9 @@ static int php_zip_extract_file(struct z
4
 
         */
5
 
        virtual_file_ex(&new_state, file, NULL, CWD_EXPAND);
6
 
        path_cleaned =  php_zip_make_relative_path(new_state.cwd, new_state.cwd_length);
7
 
+       if(!path_cleaned) {
8
 
+               return 0;
9
 
+       }
10
 
        path_cleaned_len = strlen(path_cleaned);
11
 
 
12
 
        if (path_cleaned_len >= MAXPATHLEN || zip_stat(za, file, 0, &sb) != 0) {