[lzma-sdk457] one more patch fix

Tom Callaway spot at fedoraproject.org
Fri Feb 21 14:33:31 UTC 2014


commit 9f936e99272d3285bc6c66055157261605bcc067
Author: Tom Callaway <spot at fedoraproject.org>
Date:   Fri Feb 21 06:33:48 2014 -0800

    one more patch fix

 lzma-sdk-4.5.7-format-security-fix.patch |   31 +++++++++++++++++++++++++++++-
 1 files changed, 30 insertions(+), 1 deletions(-)
---
diff --git a/lzma-sdk-4.5.7-format-security-fix.patch b/lzma-sdk-4.5.7-format-security-fix.patch
index 6c6d31c..47a34aa 100644
--- a/lzma-sdk-4.5.7-format-security-fix.patch
+++ b/lzma-sdk-4.5.7-format-security-fix.patch
@@ -1,6 +1,6 @@
 diff -up lzma457/CPP/7zip/Compress/LZMA_Alone/LzmaAlone.cpp.format-security lzma457/CPP/7zip/Compress/LZMA_Alone/LzmaAlone.cpp
 --- lzma457/CPP/7zip/Compress/LZMA_Alone/LzmaAlone.cpp.format-security	2007-12-11 22:54:27.000000000 -0800
-+++ lzma457/CPP/7zip/Compress/LZMA_Alone/LzmaAlone.cpp	2014-02-21 06:15:02.641397383 -0800
++++ lzma457/CPP/7zip/Compress/LZMA_Alone/LzmaAlone.cpp	2014-02-21 06:32:08.798397024 -0800
 @@ -467,7 +467,7 @@ int main2(int n, const char *args[])
        Byte b = Byte(fileSize >> (8 * i));
        if (outStream->Write(&b, 1, 0) != S_OK)
@@ -40,3 +40,32 @@ diff -up lzma457/CPP/7zip/Compress/LZMA_Alone/LzmaAlone.cpp.format-security lzma
          return 1;
        }
        fileSize |= ((UInt64)b) << (8 * i);
+diff -up lzma457/CPP/7zip/Compress/LZMA_Alone/LzmaBenchCon.cpp.format-security lzma457/CPP/7zip/Compress/LZMA_Alone/LzmaBenchCon.cpp
+--- lzma457/CPP/7zip/Compress/LZMA_Alone/LzmaBenchCon.cpp.format-security	2014-02-21 06:32:48.257127570 -0800
++++ lzma457/CPP/7zip/Compress/LZMA_Alone/LzmaBenchCon.cpp	2014-02-21 06:33:23.381887698 -0800
+@@ -142,7 +142,7 @@ HRESULT CBenchCallback::SetDecodeResult(
+   if (final)
+   {
+     UInt64 rating = GetDecompressRating(info.GlobalTime, info.GlobalFreq, info.UnpackSize, info.PackSize, info.NumIterations);
+-    fprintf(f, kSep);
++    fprintf(f, "%s", kSep);
+     CBenchInfo info2 = info;
+     info2.UnpackSize *= info2.NumIterations;
+     info2.PackSize *= info2.NumIterations;
+@@ -201,14 +201,14 @@ HRESULT LzmaBenchCon(
+   {
+     fprintf(f, "   Speed Usage    R/U Rating");
+     if (j == 0)
+-      fprintf(f, kSep);
++      fprintf(f, "%s", kSep);
+   }
+   fprintf(f, "\n   ");
+   for (j = 0; j < 2; j++)
+   {
+     fprintf(f, "    KB/s     %%   MIPS   MIPS");
+     if (j == 0)
+-      fprintf(f, kSep);
++      fprintf(f, "%s", kSep);
+   }
+   fprintf(f, "\n\n");
+   for (UInt32 i = 0; i < numIterations; i++)


More information about the scm-commits mailing list