Adding patch from upstream to fix a buffer overrun in zcat (Closes: #902936).
Signed-off-by: Daniel Baumann <daniel@debian.org>
This commit is contained in:
parent
02253dcc96
commit
b8f7808d57
2 changed files with 19 additions and 0 deletions
1
debian/patches/series
vendored
1
debian/patches/series
vendored
|
@ -1,2 +1,3 @@
|
||||||
debian/0001-build.patch
|
debian/0001-build.patch
|
||||||
debian/0002-zupdate.patch
|
debian/0002-zupdate.patch
|
||||||
|
upstream/0001-zcat-buffer-overrun.patch
|
||||||
|
|
18
debian/patches/upstream/0001-zcat-buffer-overrun.patch
vendored
Normal file
18
debian/patches/upstream/0001-zcat-buffer-overrun.patch
vendored
Normal file
|
@ -0,0 +1,18 @@
|
||||||
|
Author: Antonio Diaz Diaz <antonio@gnu.org>
|
||||||
|
Description: zcat.cc: Fixed a buffer overrun on outbuf when '-v' is used.
|
||||||
|
|
||||||
|
diff -Naurp zutils/zcat.cc zutils/zcat.cc
|
||||||
|
--- zutils/zcat.cc
|
||||||
|
+++ zutils/zcat.cc
|
||||||
|
@@ -232,8 +232,9 @@ int cat( int infd, const int format_inde
|
||||||
|
enum { buffer_size = 4096 };
|
||||||
|
// buffer with space for sentinel newline at the end
|
||||||
|
uint8_t * const inbuf = new uint8_t[buffer_size+1];
|
||||||
|
- // buffer with space for character quoting and 255-digit line number
|
||||||
|
- uint8_t * const outbuf = new uint8_t[(4*buffer_size)+256];
|
||||||
|
+ // buffer with space for character quoting, 255-digit line number and
|
||||||
|
+ // worst case flushing respect to inbuf.
|
||||||
|
+ uint8_t * const outbuf = new uint8_t[(5*buffer_size)+256];
|
||||||
|
int retval = 0;
|
||||||
|
Children children;
|
||||||
|
if( !set_data_feeder( input_filename, &infd, children, format_index ) )
|
Loading…
Add table
Reference in a new issue