forked from gentoo/gentoo
-
Notifications
You must be signed in to change notification settings - Fork 0
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
app-arch/unzip: Rev bump to fix build with format-security
Package-Manager: Portage-2.3.16, Repoman-2.3.6
- Loading branch information
Showing
2 changed files
with
92 additions
and
0 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,91 @@ | ||
Fix build with -Werror=format-security | ||
|
||
Origin: http://git.yoctoproject.org/cgit/cgit.cgi/poky/commit/?h=master-next&id=f7d80257afcfefdc85b6745328f2d12b957a848b | ||
Author: Edwin Plauchu <[email protected]> | ||
|
||
diff --git a/extract.c b/extract.c | ||
index 7cd9123..25c5a62 100644 | ||
--- a/extract.c | ||
+++ b/extract.c | ||
@@ -475,7 +475,7 @@ int extract_or_test_files(__G) /* return PK-type error code */ | ||
Info(slide, 0x401, ((char *)slide, | ||
LoadFarString(CentSigMsg), j + blknum*DIR_BLKSIZ + 1)); | ||
Info(slide, 0x401, ((char *)slide, | ||
- LoadFarString(ReportMsg))); | ||
+ "%s",LoadFarString(ReportMsg))); | ||
error_in_archive = PK_BADERR; | ||
} | ||
reached_end = TRUE; /* ...so no more left to do */ | ||
@@ -754,8 +754,8 @@ int extract_or_test_files(__G) /* return PK-type error code */ | ||
|
||
#ifndef SFX | ||
if (no_endsig_found) { /* just to make sure */ | ||
- Info(slide, 0x401, ((char *)slide, LoadFarString(EndSigMsg))); | ||
- Info(slide, 0x401, ((char *)slide, LoadFarString(ReportMsg))); | ||
+ Info(slide, 0x401, ((char *)slide, "%s", LoadFarString(EndSigMsg))); | ||
+ Info(slide, 0x401, ((char *)slide, "%s", LoadFarString(ReportMsg))); | ||
if (!error_in_archive) /* don't overwrite stronger error */ | ||
error_in_archive = PK_WARN; | ||
} | ||
diff --git a/list.c b/list.c | ||
index 15e0011..0b484f6 100644 | ||
--- a/list.c | ||
+++ b/list.c | ||
@@ -181,7 +181,7 @@ int list_files(__G) /* return PK-type error code */ | ||
Info(slide, 0x401, | ||
((char *)slide, LoadFarString(CentSigMsg), j)); | ||
Info(slide, 0x401, | ||
- ((char *)slide, LoadFarString(ReportMsg))); | ||
+ ((char *)slide, "%s", LoadFarString(ReportMsg))); | ||
return PK_BADERR; /* sig not found */ | ||
} | ||
} | ||
@@ -507,7 +507,7 @@ int list_files(__G) /* return PK-type error code */ | ||
&& (!G.ecrec.is_zip64_archive) | ||
&& (memcmp(G.sig, end_central_sig, 4) != 0) | ||
) { /* just to make sure again */ | ||
- Info(slide, 0x401, ((char *)slide, LoadFarString(EndSigMsg))); | ||
+ Info(slide, 0x401, ((char *)slide, "%s", LoadFarString(EndSigMsg))); | ||
error_in_archive = PK_WARN; /* didn't find sig */ | ||
} | ||
|
||
@@ -591,7 +591,7 @@ int get_time_stamp(__G__ last_modtime, nmember) /* return PK-type error code */ | ||
Info(slide, 0x401, | ||
((char *)slide, LoadFarString(CentSigMsg), j)); | ||
Info(slide, 0x401, | ||
- ((char *)slide, LoadFarString(ReportMsg))); | ||
+ ((char *)slide, "%s", LoadFarString(ReportMsg))); | ||
return PK_BADERR; /* sig not found */ | ||
} | ||
} | ||
@@ -674,7 +674,7 @@ int get_time_stamp(__G__ last_modtime, nmember) /* return PK-type error code */ | ||
---------------------------------------------------------------------------*/ | ||
|
||
if (memcmp(G.sig, end_central_sig, 4)) { /* just to make sure again */ | ||
- Info(slide, 0x401, ((char *)slide, LoadFarString(EndSigMsg))); | ||
+ Info(slide, 0x401, ((char *)slide, "%s", LoadFarString(EndSigMsg))); | ||
error_in_archive = PK_WARN; | ||
} | ||
if (*nmember == 0L && error_in_archive <= PK_WARN) | ||
diff --git a/zipinfo.c b/zipinfo.c | ||
index 0ac75b3..1e7fa82 100644 | ||
--- a/zipinfo.c | ||
+++ b/zipinfo.c | ||
@@ -833,7 +833,7 @@ int zipinfo(__G) /* return PK-type error code */ | ||
Info(slide, 0x401, | ||
((char *)slide, LoadFarString(CentSigMsg), j)); | ||
Info(slide, 0x401, | ||
- ((char *)slide, LoadFarString(ReportMsg))); | ||
+ ((char *)slide, "%s", LoadFarString(ReportMsg))); | ||
error_in_archive = PK_BADERR; /* sig not found */ | ||
break; | ||
} | ||
@@ -1022,7 +1022,7 @@ int zipinfo(__G) /* return PK-type error code */ | ||
&& (!G.ecrec.is_zip64_archive) | ||
&& (memcmp(G.sig, end_central_sig, 4) != 0) | ||
) { /* just to make sure again */ | ||
- Info(slide, 0x401, ((char *)slide, LoadFarString(EndSigMsg))); | ||
+ Info(slide, 0x401, ((char *)slide, "%s", LoadFarString(EndSigMsg))); | ||
error_in_archive = PK_WARN; /* didn't find sig */ | ||
} | ||
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters