diff options
author | Ben Gruver <bgruv@google.com> | 2018-01-23 23:51:42 +0000 |
---|---|---|
committer | android-build-merger <android-build-merger@google.com> | 2018-01-23 23:51:42 +0000 |
commit | e24cff66fe81ac0dfdc06835b82fc98b76053ba7 (patch) | |
tree | c483c9b79e436651a7705372c68fd0f90eeb26ca | |
parent | e714eb61a31dc915b4228f958dbbcd077ab2c763 (diff) | |
parent | 7fb4020b4964e7ee7449da81961af438c55849c3 (diff) | |
download | smali-e24cff66fe81ac0dfdc06835b82fc98b76053ba7.tar.gz |
Merge "Merge smali upstream into master" am: 9cd7a6e0ac
am: 7fb4020b49
Change-Id: I13955458746a13893b1171afc3ce84743c8e9dc1
4 files changed, 6 insertions, 6 deletions
diff --git a/baksmali/src/main/java/org/jf/baksmali/Adaptors/Format/InstructionMethodItem.java b/baksmali/src/main/java/org/jf/baksmali/Adaptors/Format/InstructionMethodItem.java index d58b2b68..b69995df 100644 --- a/baksmali/src/main/java/org/jf/baksmali/Adaptors/Format/InstructionMethodItem.java +++ b/baksmali/src/main/java/org/jf/baksmali/Adaptors/Format/InstructionMethodItem.java @@ -501,7 +501,7 @@ public class InstructionMethodItem<T extends Instruction> extends MethodItem { writer.write("Float.POSITIVE_INFINITY"); else if (fval == Float.NEGATIVE_INFINITY) writer.write("Float.NEGATIVE_INFINITY"); - else if (fval == Float.NaN) + else if (Float.isNaN(fval)) writer.write("Float.NaN"); else if (fval == Float.MAX_VALUE) writer.write("Float.MAX_VALUE"); @@ -528,7 +528,7 @@ public class InstructionMethodItem<T extends Instruction> extends MethodItem { writer.write("Double.POSITIVE_INFINITY"); else if (dval == Double.NEGATIVE_INFINITY) writer.write("Double.NEGATIVE_INFINITY"); - else if (dval == Double.NaN) + else if (Double.isNaN(dval)) writer.write("Double.NaN"); else if (dval == Double.MAX_VALUE) writer.write("Double.MAX_VALUE"); diff --git a/build.gradle b/build.gradle index 08da9c85..360e3db0 100644 --- a/build.gradle +++ b/build.gradle @@ -31,7 +31,7 @@ apply plugin: 'idea' -version = '2.2.1' +version = '2.2.2' def jcommanderVersion = '' if (!('release' in gradle.startParameter.taskNames)) { diff --git a/dexlib2/src/main/java/org/jf/dexlib2/dexbacked/raw/DebugInfoItem.java b/dexlib2/src/main/java/org/jf/dexlib2/dexbacked/raw/DebugInfoItem.java index 1ddd4ac0..32ee4cc9 100644 --- a/dexlib2/src/main/java/org/jf/dexlib2/dexbacked/raw/DebugInfoItem.java +++ b/dexlib2/src/main/java/org/jf/dexlib2/dexbacked/raw/DebugInfoItem.java @@ -52,8 +52,8 @@ public class DebugInfoItem { public void annotateItem(@Nonnull AnnotatedBytes out, int itemIndex, @Nullable String itemIdentity) { DexReader reader = dexFile.readerAt(out.getCursor()); - int lineStart = reader.readSmallUleb128(); - out.annotateTo(reader.getOffset(), "line_start = %d", lineStart); + int lineStart = reader.readBigUleb128(); + out.annotateTo(reader.getOffset(), "line_start = %d", lineStart & 0xFFFFFFFFL); int parametersSize = reader.readSmallUleb128(); out.annotateTo(reader.getOffset(), "parameters_size = %d", parametersSize); diff --git a/dexlib2/src/main/java/org/jf/dexlib2/writer/DexDataWriter.java b/dexlib2/src/main/java/org/jf/dexlib2/writer/DexDataWriter.java index 0102b755..f33a3be2 100644 --- a/dexlib2/src/main/java/org/jf/dexlib2/writer/DexDataWriter.java +++ b/dexlib2/src/main/java/org/jf/dexlib2/writer/DexDataWriter.java @@ -127,7 +127,7 @@ public class DexDataWriter extends BufferedOutputStream { } public static void writeUleb128(OutputStream out, int value) throws IOException { - while (value > 0x7f) { + while ((value & 0xffffffffL) > 0x7f) { out.write((value & 0x7f) | 0x80); value >>>= 7; } |