| msg79155 - (view) |
Author: Yngve AAdlandsvik (ymgve) |
Date: 2009-01-05 15:24 |
| If you have a .zip file with an incomplete "End of Central Directory" record, _EndRecData() will throw a struct.error: D:\c64workdir\Ultimate_Mag_Archive>e:ziptest.py "old - Ultimate_Mag_Archive" Handling A-z\0\64times01-double.zip Traceback (most recent call last): File "E:\wwwroot\c64db\tools\ziptest.py", line 48, in ok = handle_file(data, rel_filename) File "E:\wwwroot\c64db\tools\ziptest.py", line 19, in handle_file z = zipfile.ZipFile(cStringIO.StringIO(data), "r") File "C:\Python26\lib\zipfile.py", line 698, in __init__ self._GetContents() File "C:\Python26\lib\zipfile.py", line 718, in _GetContents self._RealGetContents() File "C:\Python26\lib\zipfile.py", line 728, in _RealGetContents endrec = _EndRecData(fp) File "C:\Python26\lib\zipfile.py", line 219, in _EndRecData endrec = list(struct.unpack(structEndArchive, recData)) struct.error: unpack requires a string argument of length 22 The fix is to include a check to see if there is data enough for the whole record before attempting to unpack. |
|
|
| msg79156 - (view) |
Author: Lukas Lueg (ebfe) |
Date: 2009-01-05 15:28 |
| please attach 64times01-double.zip if possible |
|
|
| msg79158 - (view) |
Author: Yngve AAdlandsvik (ymgve) |
Date: 2009-01-05 15:36 |
| Here is the file. Note that this can be reproduced with any zip file if you delete the last byte of the file. |
|
|
| msg114636 - (view) |
Author: Alan McIntyre (alanmcintyre) *  |
Date: 2010-08-22 01:39 |
| I wrote a test for this and tried out the patch on the Python3 trunk, and it seems to work ok. I've attached an updated patch that includes the test. It probably wouldn't hurt to go look for other places where a struct is being unpacked without checking lengths first, and see if it makes sense to add a similar check in those places, too. I may do that later if I have some more free time. |
|
|
| msg116885 - (view) |
Author: Charles-François Natali (neologix) * |
Date: 2010-09-19 21:06 |
| Following EAFP principle, it would be better - cleaner and more efficient - to put the stuct.unpack inside a try/except clause than checking the lengths beforehand. |
|
|
| msg116889 - (view) |
Author: Alan McIntyre (alanmcintyre) * |
Date: 2010-09-19 21:59 |
| I had to look up the abbreviation (Easier to Ask Forgiveness than Permission), but that does sound like a good idea. Thanks for mentioning it. :-) |
|
|
| msg176744 - (view) |
Author: Serhiy Storchaka (serhiy.storchaka) * |
Date: 2012-12-01 14:21 |
| Here is a patch for 3.4, which adds checks for other unpacks (except one, for which exists). Also BadZipfile replaced by BadZipFile and trailing whitespaces deleted. For 2.7 BadZipFile should be replaced by BadZipfile back. |
|
|
| msg176803 - (view) |
Author: Antoine Pitrou (pitrou) * |
Date: 2012-12-02 18:15 |
| In test_damaged_zipfile: + for N in range(len(s) - 2): + with open(TESTFN, "wb") as f: + f.write(s[:N]) why not `range(len(s))` instead? |
|
|
| msg176809 - (view) |
Author: Serhiy Storchaka (serhiy.storchaka) * |
Date: 2012-12-02 20:59 |
| I just copy it from Alan's test. Actually this is not needed, `range(len(s))` can be used. |
|
|
| msg180683 - (view) |
Author: Serhiy Storchaka (serhiy.storchaka) * |
Date: 2013-01-26 17:01 |
| Patch updated. Now the test use io.BytesIO() for input too. A loop limit changed from len() -2 to len(). If there are no objections I'll commit this patch next week. |
|
|
| msg181019 - (view) |
Author: Roundup Robot (python-dev)  |
Date: 2013-01-31 13:33 |
| New changeset 32de35f0f877 by Serhiy Storchaka in branch '2.7': Issue #4844: ZipFile now raises BadZipfile when opens a ZIP file with an http://hg.python.org/cpython/rev/32de35f0f877 New changeset 01147e468c8c by Serhiy Storchaka in branch '3.2': Issue #4844: ZipFile now raises BadZipFile when opens a ZIP file with an http://hg.python.org/cpython/rev/01147e468c8c New changeset 46f24a18a4ab by Serhiy Storchaka in branch '3.3': Issue #4844: ZipFile now raises BadZipFile when opens a ZIP file with an http://hg.python.org/cpython/rev/46f24a18a4ab New changeset e406b8bd7b38 by Serhiy Storchaka in branch 'default': Issue #4844: ZipFile now raises BadZipFile when opens a ZIP file with an http://hg.python.org/cpython/rev/e406b8bd7b38 |
|
|