0017-unzip-6.0-format-secure.patch (4320B)
1 diff --git a/extract.c b/extract.c 2 index eeb2f57..a0a4929 100644 3 --- a/extract.c 4 +++ b/extract.c 5 @@ -472,8 +472,8 @@ int extract_or_test_files(__G) /* return PK-type error code */ 6 */ 7 Info(slide, 0x401, ((char *)slide, 8 LoadFarString(CentSigMsg), j + blknum*DIR_BLKSIZ + 1)); 9 - Info(slide, 0x401, ((char *)slide, 10 - LoadFarString(ReportMsg))); 11 + Info(slide, 0x401, 12 + ((char *)slide,"%s", LoadFarString(ReportMsg))); 13 error_in_archive = PK_BADERR; 14 } 15 reached_end = TRUE; /* ...so no more left to do */ 16 @@ -752,8 +752,8 @@ int extract_or_test_files(__G) /* return PK-type error code */ 17 18 #ifndef SFX 19 if (no_endsig_found) { /* just to make sure */ 20 - Info(slide, 0x401, ((char *)slide, LoadFarString(EndSigMsg))); 21 - Info(slide, 0x401, ((char *)slide, LoadFarString(ReportMsg))); 22 + Info(slide, 0x401, ((char *)slide,"%s", LoadFarString(EndSigMsg))); 23 + Info(slide, 0x401, ((char *)slide,"%s", LoadFarString(ReportMsg))); 24 if (!error_in_archive) /* don't overwrite stronger error */ 25 error_in_archive = PK_WARN; 26 } 27 diff --git a/list.c b/list.c 28 index 15e0011..f7359c3 100644 29 --- a/list.c 30 +++ b/list.c 31 @@ -181,7 +181,7 @@ int list_files(__G) /* return PK-type error code */ 32 Info(slide, 0x401, 33 ((char *)slide, LoadFarString(CentSigMsg), j)); 34 Info(slide, 0x401, 35 - ((char *)slide, LoadFarString(ReportMsg))); 36 + ((char *)slide,"%s", LoadFarString(ReportMsg))); 37 return PK_BADERR; /* sig not found */ 38 } 39 } 40 @@ -507,7 +507,8 @@ int list_files(__G) /* return PK-type error code */ 41 && (!G.ecrec.is_zip64_archive) 42 && (memcmp(G.sig, end_central_sig, 4) != 0) 43 ) { /* just to make sure again */ 44 - Info(slide, 0x401, ((char *)slide, LoadFarString(EndSigMsg))); 45 + Info(slide, 0x401, 46 + ((char *)slide,"%s", LoadFarString(EndSigMsg))); 47 error_in_archive = PK_WARN; /* didn't find sig */ 48 } 49 50 @@ -591,7 +592,7 @@ int get_time_stamp(__G__ last_modtime, nmember) /* return PK-type error code */ 51 Info(slide, 0x401, 52 ((char *)slide, LoadFarString(CentSigMsg), j)); 53 Info(slide, 0x401, 54 - ((char *)slide, LoadFarString(ReportMsg))); 55 + ((char *)slide,"%s", LoadFarString(ReportMsg))); 56 return PK_BADERR; /* sig not found */ 57 } 58 } 59 @@ -674,7 +675,7 @@ int get_time_stamp(__G__ last_modtime, nmember) /* return PK-type error code */ 60 ---------------------------------------------------------------------------*/ 61 62 if (memcmp(G.sig, end_central_sig, 4)) { /* just to make sure again */ 63 - Info(slide, 0x401, ((char *)slide, LoadFarString(EndSigMsg))); 64 + Info(slide, 0x401, ((char *)slide,"%s", LoadFarString(EndSigMsg))); 65 error_in_archive = PK_WARN; 66 } 67 if (*nmember == 0L && error_in_archive <= PK_WARN) 68 diff --git a/zipinfo.c b/zipinfo.c 69 index 6e22cc8..ac5c61b 100644 70 --- a/zipinfo.c 71 +++ b/zipinfo.c 72 @@ -771,7 +771,7 @@ int zipinfo(__G) /* return PK-type error code */ 73 Info(slide, 0x401, 74 ((char *)slide, LoadFarString(CentSigMsg), j)); 75 Info(slide, 0x401, 76 - ((char *)slide, LoadFarString(ReportMsg))); 77 + ((char *)slide,"%s", LoadFarString(ReportMsg))); 78 error_in_archive = PK_BADERR; /* sig not found */ 79 break; 80 } 81 @@ -960,7 +960,8 @@ int zipinfo(__G) /* return PK-type error code */ 82 && (!G.ecrec.is_zip64_archive) 83 && (memcmp(G.sig, end_central_sig, 4) != 0) 84 ) { /* just to make sure again */ 85 - Info(slide, 0x401, ((char *)slide, LoadFarString(EndSigMsg))); 86 + Info(slide, 0x401, 87 + ((char *)slide,"%s", LoadFarString(EndSigMsg))); 88 error_in_archive = PK_WARN; /* didn't find sig */ 89 } 90