commit 462f68aa279e25fda265a87c6d3c4da3318314f8
author Treehugger Robot <treehugger-gerrit@google.com> Wed Apr 12 15:32:55 2017 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Wed Apr 12 15:32:56 2017 +0000
tree 134ed87838705183135f6e25444aa98d92061045
parent 1e42dd3e47a8b99ef9885fb89c162996535e3430
parent 1054fa132ca6db0edf743fe1b4902dd12895c003

Merge "Mark as vendor_available"

C/Android.bp

diff --git a/C/Android.bp b/C/Android.bp
index 803ecff..1ee4798 100644
--- a/C/Android.bp
+++ b/C/Android.bp
@@ -8,7 +8,7 @@
     stl: "none",
 
     cflags: ["-D_7ZIP_ST", "-Wno-empty-body"],
-    clang_cflags: ["-Wno-self-assign"],
+    clang_cflags: ["-Wno-self-assign", "-Werror"],
 
     export_include_dirs: ["."],
 

C/Lzma2Enc.c

diff --git a/C/Lzma2Enc.c b/C/Lzma2Enc.c
index 34a97f3..1627bae 100644
--- a/C/Lzma2Enc.c
+++ b/C/Lzma2Enc.c
@@ -238,7 +238,7 @@
     if (temp > p->lzmaProps.reduceSize)

     {

       UInt64 numBlocks = temp / p->blockSize;

-      if (numBlocks < t2)

+      if (t2 >= 0 && numBlocks < (UInt64) t2)

       {

         t2 = (UInt32)numBlocks;

         t3 = t1 * t2;