Fix 1684100: Making sure that empty package, type and resource ids are not accepted.

Change-Id: I4c94877e4312e9a5b4d22c8625069ca056c62e40
This commit is contained in:
Konstantin Lopyrev
2010-06-04 14:36:49 -07:00
parent 1bba846ed1
commit ddcafcbd62

View File

@@ -2609,6 +2609,24 @@ bool ResTable::expandResourceRef(const uint16_t* refStr, size_t refLen,
*outType = *defType;
}
*outName = String16(p, end-p);
if(**outPackage == 0) {
if(outErrorMsg) {
*outErrorMsg = "Resource package cannot be an empty string";
}
return false;
}
if(**outType == 0) {
if(outErrorMsg) {
*outErrorMsg = "Resource type cannot be an empty string";
}
return false;
}
if(**outName == 0) {
if(outErrorMsg) {
*outErrorMsg = "Resource id cannot be an empty string";
}
return false;
}
return true;
}