diff options
| author | Dan Cashman <dcashman@google.com> | 2018-01-26 14:25:33 -0800 |
|---|---|---|
| committer | Dan Cashman <dcashman@google.com> | 2018-01-26 21:58:30 -0800 |
| commit | 7ee17aa6b228a007129147c7a6e9ecba2a40d892 (patch) | |
| tree | c0e75e7e7049cc91980e9bff0dbbc009a4083997 /tools/aapt2/java/JavaClassGenerator_test.cpp | |
| parent | 6dbf837a3a74ea0aad15d3e4fb66a82e2161c9e7 (diff) | |
readCertsListXml: fix IndexOutofBoundsException and erroneous skip.
When reading pastCerts, flags are read along with the hex-encoded
certificate, but the index into the array is updated after reading
the cert, before reading the flags. This leads to an
ArrayIndexOutOfBoundsException. Change the iterator update to be
after both arrays have been processed.
Also move the skipCurrentTag call to the <cert /> parsing section.
The pastSigs tag has nested elements so by the time it has finished
processing, it is already at the pastSigs end-tag, which causes the
parser to continue past the <sigs> entry erroneously.
Bug: 64686581
Test: Builds, boots with app with key rotation history.
Change-Id: I3965ffb5f4306eaddc0a3a959ef0f9674068f9d2
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator_test.cpp')
0 files changed, 0 insertions, 0 deletions