Skip to content
Projeler
Gruplar
Parçacıklar
Yardım
Yükleniyor...
Oturum aç / Kaydol
Gezinmeyi değiştir
C
cpython
Proje
Proje
Ayrıntılar
Etkinlik
Cycle Analytics
Depo (repository)
Depo (repository)
Dosyalar
Kayıtlar (commit)
Dallar (branch)
Etiketler
Katkıda bulunanlar
Grafik
Karşılaştır
Grafikler
Konular (issue)
0
Konular (issue)
0
Liste
Pano
Etiketler
Kilometre Taşları
Birleştirme (merge) Talepleri
0
Birleştirme (merge) Talepleri
0
CI / CD
CI / CD
İş akışları (pipeline)
İşler
Zamanlamalar
Grafikler
Paketler
Paketler
Wiki
Wiki
Parçacıklar
Parçacıklar
Üyeler
Üyeler
Collapse sidebar
Close sidebar
Etkinlik
Grafik
Grafikler
Yeni bir konu (issue) oluştur
İşler
Kayıtlar (commit)
Konu (issue) Panoları
Kenar çubuğunu aç
Batuhan Osman TASKAYA
cpython
Commits
02512fb1
Kaydet (Commit)
02512fb1
authored
Kas 17, 2012
tarafından
Antoine Pitrou
Dosyalara gözat
Seçenekler
Dosyalara Gözat
İndir
Eposta Yamaları
Sade Fark
Issue #16408: Fix file descriptors not being closed in error conditions in the zipfile module.
Patch by Serhiy Storchaka.
üst
115bc79d
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
207 additions
and
210 deletions
+207
-210
zipfile.py
Lib/zipfile.py
+204
-210
NEWS
Misc/NEWS
+3
-0
No files found.
Lib/zipfile.py
Dosyayı görüntüle @
02512fb1
...
...
@@ -718,30 +718,34 @@ class ZipFile(object):
self
.
fp
=
file
self
.
filename
=
getattr
(
file
,
'name'
,
None
)
if
key
==
'r'
:
self
.
_GetContents
()
elif
key
==
'w'
:
# set the modified flag so central directory gets written
# even if no files are added to the archive
self
.
_didModify
=
True
elif
key
==
'a'
:
try
:
# See if file is a zip file
try
:
if
key
==
'r'
:
self
.
_RealGetContents
()
# seek to start of directory and overwrite
self
.
fp
.
seek
(
self
.
start_dir
,
0
)
except
BadZipfile
:
# file is not a zip file, just append
self
.
fp
.
seek
(
0
,
2
)
elif
key
==
'w'
:
# set the modified flag so central directory gets written
# even if no files are added to the archive
self
.
_didModify
=
True
else
:
elif
key
==
'a'
:
try
:
# See if file is a zip file
self
.
_RealGetContents
()
# seek to start of directory and overwrite
self
.
fp
.
seek
(
self
.
start_dir
,
0
)
except
BadZipfile
:
# file is not a zip file, just append
self
.
fp
.
seek
(
0
,
2
)
# set the modified flag so central directory gets written
# even if no files are added to the archive
self
.
_didModify
=
True
else
:
raise
RuntimeError
(
'Mode must be "r", "w" or "a"'
)
except
:
fp
=
self
.
fp
self
.
fp
=
None
if
not
self
.
_filePassed
:
self
.
fp
.
close
()
self
.
fp
=
None
raise
RuntimeError
,
'Mode must be "r", "w" or "a"'
fp
.
close
()
raise
def
__enter__
(
self
):
return
self
...
...
@@ -749,17 +753,6 @@ class ZipFile(object):
def
__exit__
(
self
,
type
,
value
,
traceback
):
self
.
close
()
def
_GetContents
(
self
):
"""Read the directory, making sure we close the file if the format
is bad."""
try
:
self
.
_RealGetContents
()
except
BadZipfile
:
if
not
self
.
_filePassed
:
self
.
fp
.
close
()
self
.
fp
=
None
raise
def
_RealGetContents
(
self
):
"""Read in the table of contents for the ZIP file."""
fp
=
self
.
fp
...
...
@@ -853,9 +846,9 @@ class ZipFile(object):
try
:
# Read by chunks, to avoid an OverflowError or a
# MemoryError with very large embedded files.
f
=
self
.
open
(
zinfo
.
filename
,
"r"
)
while
f
.
read
(
chunk_size
):
# Check CRC-32
pass
with
self
.
open
(
zinfo
.
filename
,
"r"
)
as
f
:
while
f
.
read
(
chunk_size
):
# Check CRC-32
pass
except
BadZipfile
:
return
zinfo
.
filename
...
...
@@ -909,60 +902,65 @@ class ZipFile(object):
zef_file
=
open
(
self
.
filename
,
'rb'
)
should_close
=
True
# Make sure we have an info object
if
isinstance
(
name
,
ZipInfo
):
# 'name' is already an info object
zinfo
=
name
else
:
# Get info object for name
zinfo
=
self
.
getinfo
(
name
)
zef_file
.
seek
(
zinfo
.
header_offset
,
0
)
# Skip the file header:
fheader
=
zef_file
.
read
(
sizeFileHeader
)
if
fheader
[
0
:
4
]
!=
stringFileHeader
:
raise
BadZipfile
,
"Bad magic number for file header"
fheader
=
struct
.
unpack
(
structFileHeader
,
fheader
)
fname
=
zef_file
.
read
(
fheader
[
_FH_FILENAME_LENGTH
])
if
fheader
[
_FH_EXTRA_FIELD_LENGTH
]:
zef_file
.
read
(
fheader
[
_FH_EXTRA_FIELD_LENGTH
])
if
fname
!=
zinfo
.
orig_filename
:
raise
BadZipfile
,
\
'File name in directory "
%
s" and header "
%
s" differ.'
%
(
zinfo
.
orig_filename
,
fname
)
# check for encrypted flag & handle password
is_encrypted
=
zinfo
.
flag_bits
&
0x1
zd
=
None
if
is_encrypted
:
if
not
pwd
:
pwd
=
self
.
pwd
if
not
pwd
:
raise
RuntimeError
,
"File
%
s is encrypted, "
\
"password required for extraction"
%
name
zd
=
_ZipDecrypter
(
pwd
)
# The first 12 bytes in the cypher stream is an encryption header
# used to strengthen the algorithm. The first 11 bytes are
# completely random, while the 12th contains the MSB of the CRC,
# or the MSB of the file time depending on the header type
# and is used to check the correctness of the password.
bytes
=
zef_file
.
read
(
12
)
h
=
map
(
zd
,
bytes
[
0
:
12
])
if
zinfo
.
flag_bits
&
0x8
:
# compare against the file type from extended local headers
check_byte
=
(
zinfo
.
_raw_time
>>
8
)
&
0xff
try
:
# Make sure we have an info object
if
isinstance
(
name
,
ZipInfo
):
# 'name' is already an info object
zinfo
=
name
else
:
# compare against the CRC otherwise
check_byte
=
(
zinfo
.
CRC
>>
24
)
&
0xff
if
ord
(
h
[
11
])
!=
check_byte
:
raise
RuntimeError
(
"Bad password for file"
,
name
)
return
ZipExtFile
(
zef_file
,
mode
,
zinfo
,
zd
,
close_fileobj
=
should_close
)
# Get info object for name
zinfo
=
self
.
getinfo
(
name
)
zef_file
.
seek
(
zinfo
.
header_offset
,
0
)
# Skip the file header:
fheader
=
zef_file
.
read
(
sizeFileHeader
)
if
fheader
[
0
:
4
]
!=
stringFileHeader
:
raise
BadZipfile
,
"Bad magic number for file header"
fheader
=
struct
.
unpack
(
structFileHeader
,
fheader
)
fname
=
zef_file
.
read
(
fheader
[
_FH_FILENAME_LENGTH
])
if
fheader
[
_FH_EXTRA_FIELD_LENGTH
]:
zef_file
.
read
(
fheader
[
_FH_EXTRA_FIELD_LENGTH
])
if
fname
!=
zinfo
.
orig_filename
:
raise
BadZipfile
,
\
'File name in directory "
%
s" and header "
%
s" differ.'
%
(
zinfo
.
orig_filename
,
fname
)
# check for encrypted flag & handle password
is_encrypted
=
zinfo
.
flag_bits
&
0x1
zd
=
None
if
is_encrypted
:
if
not
pwd
:
pwd
=
self
.
pwd
if
not
pwd
:
raise
RuntimeError
,
"File
%
s is encrypted, "
\
"password required for extraction"
%
name
zd
=
_ZipDecrypter
(
pwd
)
# The first 12 bytes in the cypher stream is an encryption header
# used to strengthen the algorithm. The first 11 bytes are
# completely random, while the 12th contains the MSB of the CRC,
# or the MSB of the file time depending on the header type
# and is used to check the correctness of the password.
bytes
=
zef_file
.
read
(
12
)
h
=
map
(
zd
,
bytes
[
0
:
12
])
if
zinfo
.
flag_bits
&
0x8
:
# compare against the file type from extended local headers
check_byte
=
(
zinfo
.
_raw_time
>>
8
)
&
0xff
else
:
# compare against the CRC otherwise
check_byte
=
(
zinfo
.
CRC
>>
24
)
&
0xff
if
ord
(
h
[
11
])
!=
check_byte
:
raise
RuntimeError
(
"Bad password for file"
,
name
)
return
ZipExtFile
(
zef_file
,
mode
,
zinfo
,
zd
,
close_fileobj
=
should_close
)
except
:
if
should_close
:
zef_file
.
close
()
raise
def
extract
(
self
,
member
,
path
=
None
,
pwd
=
None
):
"""Extract a member from the archive to the current working directory,
...
...
@@ -1019,11 +1017,9 @@ class ZipFile(object):
os
.
mkdir
(
targetpath
)
return
targetpath
source
=
self
.
open
(
member
,
pwd
=
pwd
)
target
=
file
(
targetpath
,
"wb"
)
shutil
.
copyfileobj
(
source
,
target
)
source
.
close
()
target
.
close
()
with
self
.
open
(
member
,
pwd
=
pwd
)
as
source
,
\
file
(
targetpath
,
"wb"
)
as
target
:
shutil
.
copyfileobj
(
source
,
target
)
return
targetpath
...
...
@@ -1184,102 +1180,104 @@ class ZipFile(object):
if
self
.
fp
is
None
:
return
if
self
.
mode
in
(
"w"
,
"a"
)
and
self
.
_didModify
:
# write ending records
count
=
0
pos1
=
self
.
fp
.
tell
()
for
zinfo
in
self
.
filelist
:
# write central directory
count
=
count
+
1
dt
=
zinfo
.
date_time
dosdate
=
(
dt
[
0
]
-
1980
)
<<
9
|
dt
[
1
]
<<
5
|
dt
[
2
]
dostime
=
dt
[
3
]
<<
11
|
dt
[
4
]
<<
5
|
(
dt
[
5
]
//
2
)
extra
=
[]
if
zinfo
.
file_size
>
ZIP64_LIMIT
\
or
zinfo
.
compress_size
>
ZIP64_LIMIT
:
extra
.
append
(
zinfo
.
file_size
)
extra
.
append
(
zinfo
.
compress_size
)
file_size
=
0xffffffff
compress_size
=
0xffffffff
else
:
file_size
=
zinfo
.
file_size
compress_size
=
zinfo
.
compress_size
if
zinfo
.
header_offset
>
ZIP64_LIMIT
:
extra
.
append
(
zinfo
.
header_offset
)
header_offset
=
0xffffffff
L
else
:
header_offset
=
zinfo
.
header_offset
extra_data
=
zinfo
.
extra
if
extra
:
# Append a ZIP64 field to the extra's
extra_data
=
struct
.
pack
(
'<HH'
+
'Q'
*
len
(
extra
),
1
,
8
*
len
(
extra
),
*
extra
)
+
extra_data
extract_version
=
max
(
45
,
zinfo
.
extract_version
)
create_version
=
max
(
45
,
zinfo
.
create_version
)
else
:
extract_version
=
zinfo
.
extract_version
create_version
=
zinfo
.
create_version
try
:
filename
,
flag_bits
=
zinfo
.
_encodeFilenameFlags
()
centdir
=
struct
.
pack
(
structCentralDir
,
stringCentralDir
,
create_version
,
zinfo
.
create_system
,
extract_version
,
zinfo
.
reserved
,
flag_bits
,
zinfo
.
compress_type
,
dostime
,
dosdate
,
zinfo
.
CRC
,
compress_size
,
file_size
,
len
(
filename
),
len
(
extra_data
),
len
(
zinfo
.
comment
),
0
,
zinfo
.
internal_attr
,
zinfo
.
external_attr
,
header_offset
)
except
DeprecationWarning
:
print
>>
sys
.
stderr
,
(
structCentralDir
,
stringCentralDir
,
create_version
,
zinfo
.
create_system
,
extract_version
,
zinfo
.
reserved
,
zinfo
.
flag_bits
,
zinfo
.
compress_type
,
dostime
,
dosdate
,
zinfo
.
CRC
,
compress_size
,
file_size
,
len
(
zinfo
.
filename
),
len
(
extra_data
),
len
(
zinfo
.
comment
),
0
,
zinfo
.
internal_attr
,
zinfo
.
external_attr
,
header_offset
)
raise
self
.
fp
.
write
(
centdir
)
self
.
fp
.
write
(
filename
)
self
.
fp
.
write
(
extra_data
)
self
.
fp
.
write
(
zinfo
.
comment
)
pos2
=
self
.
fp
.
tell
()
# Write end-of-zip-archive record
centDirCount
=
count
centDirSize
=
pos2
-
pos1
centDirOffset
=
pos1
if
(
centDirCount
>=
ZIP_FILECOUNT_LIMIT
or
centDirOffset
>
ZIP64_LIMIT
or
centDirSize
>
ZIP64_LIMIT
):
# Need to write the ZIP64 end-of-archive records
zip64endrec
=
struct
.
pack
(
structEndArchive64
,
stringEndArchive64
,
44
,
45
,
45
,
0
,
0
,
centDirCount
,
centDirCount
,
centDirSize
,
centDirOffset
)
self
.
fp
.
write
(
zip64endrec
)
zip64locrec
=
struct
.
pack
(
structEndArchive64Locator
,
stringEndArchive64Locator
,
0
,
pos2
,
1
)
self
.
fp
.
write
(
zip64locrec
)
centDirCount
=
min
(
centDirCount
,
0xFFFF
)
centDirSize
=
min
(
centDirSize
,
0xFFFFFFFF
)
centDirOffset
=
min
(
centDirOffset
,
0xFFFFFFFF
)
endrec
=
struct
.
pack
(
structEndArchive
,
stringEndArchive
,
0
,
0
,
centDirCount
,
centDirCount
,
centDirSize
,
centDirOffset
,
len
(
self
.
_comment
))
self
.
fp
.
write
(
endrec
)
self
.
fp
.
write
(
self
.
_comment
)
self
.
fp
.
flush
()
if
not
self
.
_filePassed
:
self
.
fp
.
close
()
self
.
fp
=
None
try
:
if
self
.
mode
in
(
"w"
,
"a"
)
and
self
.
_didModify
:
# write ending records
count
=
0
pos1
=
self
.
fp
.
tell
()
for
zinfo
in
self
.
filelist
:
# write central directory
count
=
count
+
1
dt
=
zinfo
.
date_time
dosdate
=
(
dt
[
0
]
-
1980
)
<<
9
|
dt
[
1
]
<<
5
|
dt
[
2
]
dostime
=
dt
[
3
]
<<
11
|
dt
[
4
]
<<
5
|
(
dt
[
5
]
//
2
)
extra
=
[]
if
zinfo
.
file_size
>
ZIP64_LIMIT
\
or
zinfo
.
compress_size
>
ZIP64_LIMIT
:
extra
.
append
(
zinfo
.
file_size
)
extra
.
append
(
zinfo
.
compress_size
)
file_size
=
0xffffffff
compress_size
=
0xffffffff
else
:
file_size
=
zinfo
.
file_size
compress_size
=
zinfo
.
compress_size
if
zinfo
.
header_offset
>
ZIP64_LIMIT
:
extra
.
append
(
zinfo
.
header_offset
)
header_offset
=
0xffffffff
L
else
:
header_offset
=
zinfo
.
header_offset
extra_data
=
zinfo
.
extra
if
extra
:
# Append a ZIP64 field to the extra's
extra_data
=
struct
.
pack
(
'<HH'
+
'Q'
*
len
(
extra
),
1
,
8
*
len
(
extra
),
*
extra
)
+
extra_data
extract_version
=
max
(
45
,
zinfo
.
extract_version
)
create_version
=
max
(
45
,
zinfo
.
create_version
)
else
:
extract_version
=
zinfo
.
extract_version
create_version
=
zinfo
.
create_version
try
:
filename
,
flag_bits
=
zinfo
.
_encodeFilenameFlags
()
centdir
=
struct
.
pack
(
structCentralDir
,
stringCentralDir
,
create_version
,
zinfo
.
create_system
,
extract_version
,
zinfo
.
reserved
,
flag_bits
,
zinfo
.
compress_type
,
dostime
,
dosdate
,
zinfo
.
CRC
,
compress_size
,
file_size
,
len
(
filename
),
len
(
extra_data
),
len
(
zinfo
.
comment
),
0
,
zinfo
.
internal_attr
,
zinfo
.
external_attr
,
header_offset
)
except
DeprecationWarning
:
print
>>
sys
.
stderr
,
(
structCentralDir
,
stringCentralDir
,
create_version
,
zinfo
.
create_system
,
extract_version
,
zinfo
.
reserved
,
zinfo
.
flag_bits
,
zinfo
.
compress_type
,
dostime
,
dosdate
,
zinfo
.
CRC
,
compress_size
,
file_size
,
len
(
zinfo
.
filename
),
len
(
extra_data
),
len
(
zinfo
.
comment
),
0
,
zinfo
.
internal_attr
,
zinfo
.
external_attr
,
header_offset
)
raise
self
.
fp
.
write
(
centdir
)
self
.
fp
.
write
(
filename
)
self
.
fp
.
write
(
extra_data
)
self
.
fp
.
write
(
zinfo
.
comment
)
pos2
=
self
.
fp
.
tell
()
# Write end-of-zip-archive record
centDirCount
=
count
centDirSize
=
pos2
-
pos1
centDirOffset
=
pos1
if
(
centDirCount
>=
ZIP_FILECOUNT_LIMIT
or
centDirOffset
>
ZIP64_LIMIT
or
centDirSize
>
ZIP64_LIMIT
):
# Need to write the ZIP64 end-of-archive records
zip64endrec
=
struct
.
pack
(
structEndArchive64
,
stringEndArchive64
,
44
,
45
,
45
,
0
,
0
,
centDirCount
,
centDirCount
,
centDirSize
,
centDirOffset
)
self
.
fp
.
write
(
zip64endrec
)
zip64locrec
=
struct
.
pack
(
structEndArchive64Locator
,
stringEndArchive64Locator
,
0
,
pos2
,
1
)
self
.
fp
.
write
(
zip64locrec
)
centDirCount
=
min
(
centDirCount
,
0xFFFF
)
centDirSize
=
min
(
centDirSize
,
0xFFFFFFFF
)
centDirOffset
=
min
(
centDirOffset
,
0xFFFFFFFF
)
endrec
=
struct
.
pack
(
structEndArchive
,
stringEndArchive
,
0
,
0
,
centDirCount
,
centDirCount
,
centDirSize
,
centDirOffset
,
len
(
self
.
_comment
))
self
.
fp
.
write
(
endrec
)
self
.
fp
.
write
(
self
.
_comment
)
self
.
fp
.
flush
()
finally
:
fp
=
self
.
fp
self
.
fp
=
None
if
not
self
.
_filePassed
:
fp
.
close
()
class
PyZipFile
(
ZipFile
):
...
...
@@ -1401,16 +1399,15 @@ def main(args = None):
if
len
(
args
)
!=
2
:
print
USAGE
sys
.
exit
(
1
)
zf
=
ZipFile
(
args
[
1
],
'r'
)
zf
.
printdir
()
zf
.
close
()
with
ZipFile
(
args
[
1
],
'r'
)
as
zf
:
zf
.
printdir
()
elif
args
[
0
]
==
'-t'
:
if
len
(
args
)
!=
2
:
print
USAGE
sys
.
exit
(
1
)
zf
=
ZipFile
(
args
[
1
],
'r'
)
badfile
=
zf
.
testzip
()
with
ZipFile
(
args
[
1
],
'r'
)
as
zf
:
badfile
=
zf
.
testzip
()
if
badfile
:
print
(
"The following enclosed file is corrupted: {!r}"
.
format
(
badfile
))
print
"Done testing"
...
...
@@ -1420,20 +1417,19 @@ def main(args = None):
print
USAGE
sys
.
exit
(
1
)
zf
=
ZipFile
(
args
[
1
],
'r'
)
out
=
args
[
2
]
for
path
in
zf
.
namelist
():
if
path
.
startswith
(
'./'
):
tgt
=
os
.
path
.
join
(
out
,
path
[
2
:])
else
:
tgt
=
os
.
path
.
join
(
out
,
path
)
with
ZipFile
(
args
[
1
],
'r'
)
as
zf
:
out
=
args
[
2
]
for
path
in
zf
.
namelist
():
if
path
.
startswith
(
'./'
):
tgt
=
os
.
path
.
join
(
out
,
path
[
2
:])
else
:
tgt
=
os
.
path
.
join
(
out
,
path
)
tgtdir
=
os
.
path
.
dirname
(
tgt
)
if
not
os
.
path
.
exists
(
tgtdir
):
os
.
makedirs
(
tgtdir
)
with
open
(
tgt
,
'wb'
)
as
fp
:
fp
.
write
(
zf
.
read
(
path
))
zf
.
close
()
tgtdir
=
os
.
path
.
dirname
(
tgt
)
if
not
os
.
path
.
exists
(
tgtdir
):
os
.
makedirs
(
tgtdir
)
with
open
(
tgt
,
'wb'
)
as
fp
:
fp
.
write
(
zf
.
read
(
path
))
elif
args
[
0
]
==
'-c'
:
if
len
(
args
)
<
3
:
...
...
@@ -1449,11 +1445,9 @@ def main(args = None):
os
.
path
.
join
(
path
,
nm
),
os
.
path
.
join
(
zippath
,
nm
))
# else: ignore
zf
=
ZipFile
(
args
[
1
],
'w'
,
allowZip64
=
True
)
for
src
in
args
[
2
:]:
addToZip
(
zf
,
src
,
os
.
path
.
basename
(
src
))
zf
.
close
()
with
ZipFile
(
args
[
1
],
'w'
,
allowZip64
=
True
)
as
zf
:
for
src
in
args
[
2
:]:
addToZip
(
zf
,
src
,
os
.
path
.
basename
(
src
))
if
__name__
==
"__main__"
:
main
()
Misc/NEWS
Dosyayı görüntüle @
02512fb1
...
...
@@ -148,6 +148,9 @@ Core and Builtins
Library
-------
-
Issue
#
16408
:
Fix
file
descriptors
not
being
closed
in
error
conditions
in
the
zipfile
module
.
Patch
by
Serhiy
Storchaka
.
-
Issue
#
16327
:
The
subprocess
module
no
longer
leaks
file
descriptors
used
for
stdin
/
stdout
/
stderr
pipes
to
the
child
when
fork
()
fails
.
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment