Blame unzip-6.0-cve-2018-1000035-heap-based-overflow.patch
|
 |
8d5c0ff |
--- a/fileio.c 2014-12-05 05:06:05 -0600
|
|
|
8d5c0ff |
+++ b/fileio.c 2017-11-14 01:06:28 -0600
|
|
|
8d5c0ff |
@@ -1,5 +1,5 @@
|
|
|
8d5c0ff |
/*
|
|
|
8d5c0ff |
- Copyright (c) 1990-2009 Info-ZIP. All rights reserved.
|
|
|
8d5c0ff |
+ Copyright (c) 1990-2017 Info-ZIP. All rights reserved.
|
|
|
8d5c0ff |
|
|
|
8d5c0ff |
See the accompanying file LICENSE, version 2009-Jan-02 or later
|
|
|
8d5c0ff |
(the contents of which are also included in unzip.h) for terms of use.
|
|
|
8d5c0ff |
@@ -1582,6 +1582,8 @@
|
|
|
8d5c0ff |
int r = IZ_PW_ENTERED;
|
|
|
8d5c0ff |
char *m;
|
|
|
8d5c0ff |
char *prompt;
|
|
|
8d5c0ff |
+ char *ep;
|
|
|
8d5c0ff |
+ char *zp;
|
|
|
8d5c0ff |
|
|
|
8d5c0ff |
#ifndef REENTRANT
|
|
|
8d5c0ff |
/* tell picky compilers to shut up about "unused variable" warnings */
|
|
|
8d5c0ff |
@@ -1590,9 +1592,12 @@
|
|
|
8d5c0ff |
|
|
|
8d5c0ff |
if (*rcnt == 0) { /* First call for current entry */
|
|
|
8d5c0ff |
*rcnt = 2;
|
|
|
8d5c0ff |
- if ((prompt = (char *)malloc(2*FILNAMSIZ + 15)) != (char *)NULL) {
|
|
|
8d5c0ff |
- sprintf(prompt, LoadFarString(PasswPrompt),
|
|
|
8d5c0ff |
- FnFilter1(zfn), FnFilter2(efn));
|
|
|
8d5c0ff |
+ zp = FnFilter1( zfn);
|
|
|
8d5c0ff |
+ ep = FnFilter2( efn);
|
|
|
8d5c0ff |
+ prompt = (char *)malloc( /* Slightly too long (2* "%s"). */
|
|
|
8d5c0ff |
+ sizeof( PasswPrompt)+ strlen( zp)+ strlen( ep));
|
|
|
8d5c0ff |
+ if (prompt != (char *)NULL) {
|
|
|
8d5c0ff |
+ sprintf(prompt, LoadFarString(PasswPrompt), zp, ep);
|
|
|
8d5c0ff |
m = prompt;
|
|
|
8d5c0ff |
} else
|
|
|
8d5c0ff |
m = (char *)LoadFarString(PasswPrompt2);
|