chrome/android/webapk/libs/client/src/org/chromium/webapk/lib/client/WebApkVerifySignature.java - Issue 2896273005: Fix bug in one conditional. Add more apk test files.

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: chrome/android/webapk/libs/client/src/org/chromium/webapk/lib/client/WebApkVerifySignature.java

Issue 2896273005: Fix bug in one conditional. Add more apk test files. (Closed)

Patch Set: Fix error in conditional. Add more test files. Created 3 years, 7 months ago

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Jump to:

View side-by-side diff with in-line comments

Download patch

« no previous file with comments | « chrome/android/webapk/libs/client/junit/src/org/chromium/webapk/lib/client/WebApkValidatorTest.java ('k') | chrome/test/data/webapks/extra-field-too-large.apk » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/android/webapk/libs/client/src/org/chromium/webapk/lib/client/WebApkVerifySignature.java

diff --git a/chrome/android/webapk/libs/client/src/org/chromium/webapk/lib/client/WebApkVerifySignature.java b/chrome/android/webapk/libs/client/src/org/chromium/webapk/lib/client/WebApkVerifySignature.java

index 6b8987c1a6d35d080c0ea4adef2276362b4a211e..0ffbf597c6b339f8ca6a85650657101b04585cff 100644

--- a/chrome/android/webapk/libs/client/src/org/chromium/webapk/lib/client/WebApkVerifySignature.java

+++ b/chrome/android/webapk/libs/client/src/org/chromium/webapk/lib/client/WebApkVerifySignature.java

@@ -379,7 +379,7 @@ public class WebApkVerifySignature {

if (V2_SIGNING_MAGIC.equals(magic)) {

// Only if we have a v2 signature do we allow medium sized gap between the last

// block and the start of the central directory.

- if (positionOfLastByteOfLastBlock + MAX_V2_SIGNING_BLOCK_SIZE > mCentralDirOffset) {

+ if (mCentralDirOffset - positionOfLastByteOfLastBlock > MAX_V2_SIGNING_BLOCK_SIZE) {

return ERROR_BAD_V2_BLOCK;

Xi Han 2017/05/24 18:28:52 Can you make this error more meaningful?

ScottK 2017/05/25 00:26:25 Done.

}

} else {