这是indexloc提供的服务，不要输入任何密码
Skip to content

B709 #710

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
wants to merge 3 commits into from
Closed

B709 #710

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
d797dd1
Fix bug #709
Aug 22, 2019
e07a3bf
Fix bug #709
Aug 22, 2019
9d76851
Fix bug #709
Aug 22, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions dexlib2/src/main/java/org/jf/dexlib2/util/Preconditions.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -220,13 +220,13 @@ public static int checkArrayPayloadElementWidth(int elementWidth) {
}

public static <L extends List<? extends Number>> L checkArrayPayloadElements(int elementWidth, L elements) {
// mask of all bits that do not fit into an 'elementWidth'-bit number
long bitmask = -1L << elementWidth;
// mask of all bits that do not fit into an 'elementWidth'-byte number
long bitmask = -1L << (elementWidth * 8);

for (Number element : elements) {
if ((element.longValue() & bitmask) != 0) {
throw new IllegalArgumentException(
String.format("Number %d must fit into a %d-bit number", element.longValue(), elementWidth));
String.format("Number %d must fit into a %d-byte number", element.longValue(), elementWidth));
}
}

Expand Down
23 changes: 23 additions & 0 deletions dexlib2/src/test/java/org/jf/util/PreconditionsTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,23 @@
package org.jf.util;

import java.util.ArrayList;
import java.util.List;
import org.jf.dexlib2.Opcode;
import org.jf.dexlib2.iface.instruction.formats.ArrayPayload;
import org.jf.dexlib2.util.Preconditions;
import org.junit.Assert;
import org.junit.Test;

public class PreconditionsTest {

@Test
public void checkArrayPayloadElements() {
int intSize = 4;
int bigNumber = 16843071;
List<Number> numbers = new ArrayList<>();
numbers.add(bigNumber);

// Shouldn't throw any exceptions, payload is correct.
Preconditions.checkArrayPayloadElements(intSize, numbers);
}
}