package/archiver/unzip/unzip-6.0-format-secure.patch

   1 # --- T2-COPYRIGHT-NOTE-BEGIN ---
   2 # T2 SDE: package/*/unzip/unzip-6.0-format-secure.patch
   3 # Copyright (C) 2022 The T2 SDE Project
   4 #
   5 # This Copyright note is generated by scripts/Create-CopyPatch,
   6 # more information can be found in the files COPYING and README.
   7 #
   8 # This patch file is dual-licensed. It is available under the license the
   9 # patched project is licensed under, as long as it is an OpenSource license
  10 # as defined at http://www.opensource.org/ (e.g. BSD, X11) or under the terms
  11 # of the GNU General Public License version 2 as used by the T2 SDE.
  12 # --- T2-COPYRIGHT-NOTE-END ---
  13
  14 diff --git a/extract.c b/extract.c
  15 index eeb2f57..a0a4929 100644
  16 --- a/extract.c
  17 +++ b/extract.c
  18 @@ -472,8 +472,8 @@ int extract_or_test_files(__G)    /* return PK-type error code */
  19                       */
  20                      Info(slide, 0x401, ((char *)slide,
  21                        LoadFarString(CentSigMsg), j + blknum*DIR_BLKSIZ + 1));
  22 -                    Info(slide, 0x401, ((char *)slide,
  23 -                      LoadFarString(ReportMsg)));
  24 +                    Info(slide, 0x401,
  25 +                         ((char *)slide,"%s", LoadFarString(ReportMsg)));
  26                      error_in_archive = PK_BADERR;
  27                  }
  28                  reached_end = TRUE;     /* ...so no more left to do */
  29 @@ -752,8 +752,8 @@ int extract_or_test_files(__G)    /* return PK-type error code */
  30
  31  #ifndef SFX
  32      if (no_endsig_found) {                      /* just to make sure */
  33 -        Info(slide, 0x401, ((char *)slide, LoadFarString(EndSigMsg)));
  34 -        Info(slide, 0x401, ((char *)slide, LoadFarString(ReportMsg)));
  35 +        Info(slide, 0x401, ((char *)slide,"%s", LoadFarString(EndSigMsg)));
  36 +        Info(slide, 0x401, ((char *)slide,"%s", LoadFarString(ReportMsg)));
  37          if (!error_in_archive)       /* don't overwrite stronger error */
  38              error_in_archive = PK_WARN;
  39      }
  40 diff --git a/list.c b/list.c
  41 index 15e0011..f7359c3 100644
  42 --- a/list.c
  43 +++ b/list.c
  44 @@ -181,7 +181,7 @@ int list_files(__G)    /* return PK-type error code */
  45                  Info(slide, 0x401,
  46                       ((char *)slide, LoadFarString(CentSigMsg), j));
  47                  Info(slide, 0x401,
  48 -                     ((char *)slide, LoadFarString(ReportMsg)));
  49 +                     ((char *)slide,"%s", LoadFarString(ReportMsg)));
  50                  return PK_BADERR;   /* sig not found */
  51              }
  52          }
  53 @@ -507,7 +507,8 @@ int list_files(__G)    /* return PK-type error code */
  54              && (!G.ecrec.is_zip64_archive)
  55              && (memcmp(G.sig, end_central_sig, 4) != 0)
  56             ) {          /* just to make sure again */
  57 -            Info(slide, 0x401, ((char *)slide, LoadFarString(EndSigMsg)));
  58 +            Info(slide, 0x401,
  59 +                 ((char *)slide,"%s", LoadFarString(EndSigMsg)));
  60              error_in_archive = PK_WARN;   /* didn't find sig */
  61          }
  62
  63 @@ -591,7 +592,7 @@ int get_time_stamp(__G__ last_modtime, nmember)  /* return PK-type error code */
  64                  Info(slide, 0x401,
  65                       ((char *)slide, LoadFarString(CentSigMsg), j));
  66                  Info(slide, 0x401,
  67 -                     ((char *)slide, LoadFarString(ReportMsg)));
  68 +                     ((char *)slide,"%s", LoadFarString(ReportMsg)));
  69                  return PK_BADERR;   /* sig not found */
  70              }
  71          }
  72 @@ -674,7 +675,7 @@ int get_time_stamp(__G__ last_modtime, nmember)  /* return PK-type error code */
  73    ---------------------------------------------------------------------------*/
  74
  75      if (memcmp(G.sig, end_central_sig, 4)) {    /* just to make sure again */
  76 -        Info(slide, 0x401, ((char *)slide, LoadFarString(EndSigMsg)));
  77 +        Info(slide, 0x401, ((char *)slide,"%s", LoadFarString(EndSigMsg)));
  78          error_in_archive = PK_WARN;
  79      }
  80      if (*nmember == 0L && error_in_archive <= PK_WARN)
  81 diff --git a/zipinfo.c b/zipinfo.c
  82 index 6e22cc8..ac5c61b 100644
  83 --- a/zipinfo.c
  84 +++ b/zipinfo.c
  85 @@ -771,7 +771,7 @@ int zipinfo(__G)   /* return PK-type error code */
  86                  Info(slide, 0x401,
  87                       ((char *)slide, LoadFarString(CentSigMsg), j));
  88                  Info(slide, 0x401,
  89 -                     ((char *)slide, LoadFarString(ReportMsg)));
  90 +                     ((char *)slide,"%s", LoadFarString(ReportMsg)));
  91                  error_in_archive = PK_BADERR;   /* sig not found */
  92                  break;
  93              }
  94 @@ -960,7 +960,8 @@ int zipinfo(__G)   /* return PK-type error code */
  95              && (!G.ecrec.is_zip64_archive)
  96              && (memcmp(G.sig, end_central_sig, 4) != 0)
  97             ) {          /* just to make sure again */
  98 -            Info(slide, 0x401, ((char *)slide, LoadFarString(EndSigMsg)));
  99 +            Info(slide, 0x401,
 100 +                 ((char *)slide,"%s", LoadFarString(EndSigMsg)));
 101              error_in_archive = PK_WARN;   /* didn't find sig */
 102          }
 103