Merge "readCertsListXml: fix IndexOutofBoundsException and erroneous skip." (f30dc952) · Commits · e / os / android_frameworks_base

services/core/java/com/android/server/pm/PackageSignatures.java

+3 −4

Original line number	Diff line number	Diff line
		@@ -182,7 +182,6 @@ class PackageSignatures {
		Signature sig = readSignatures.get(idx);
		if (sig != null) {
		signatures[pos] = readSignatures.get(idx);
		pos++;
		} else {
		PackageManagerService.reportSettingsProblem(Log.WARN,
		"Error in package manager settings: <cert> "
		@@ -202,7 +201,6 @@ class PackageSignatures {
		Signature sig = new Signature(key);
		readSignatures.set(idx, sig);
		signatures[pos] = sig;
		pos++;
		}
		} catch (NumberFormatException e) {
		PackageManagerService.reportSettingsProblem(Log.WARN,
		@@ -245,6 +243,8 @@ class PackageSignatures {
		+ "many <cert> tags, expected " + count
		+ " at " + parser.getPositionDescription());
		}
		pos++;
		XmlUtils.skipCurrentTag(parser);
		} else if (tagName.equals("pastSigs")) {
		if (flags == null) {
		// we haven't encountered pastSigs yet, go ahead
		@@ -297,7 +297,6 @@ class PackageSignatures {
		"Unknown element under <sigs>: "
		+ parser.getName());
		}
		XmlUtils.skipCurrentTag(parser);
		}
		return pos;
		}