openkylin
/
platform_build
mirror of https://gitee.com/openkylin/platform_build.git
9
0
Fork 1
Code Issues Projects Releases Wiki Activity

Merge "Add compile time check that friendly AID names are < 32 characters" 

am: 9f25d873bf

Change-Id: Iace2d0294a7ca5318d568614b021a13713a72a78
This commit is contained in:
Tom Cherry 2018-02-09 18:53:56 +00:00 committed by android-build-merger
parent 7209b4066b 9f25d873bf
commit cfac68eb9c
1 changed files with 12 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
tools/fs_config/fs_config_generator.py
View File

@ -146,18 +146,27 @@ class AID(object):
found (str): The file found in, not required to be specified. found (str): The file found in, not required to be specified.
Raises: Raises:
ValueError: if the friendly name is longer than 31 characters as
that is bionic's internal buffer size for name.
ValueError: if value is not a valid string number as processed by ValueError: if value is not a valid string number as processed by
int(x, 0) int(x, 0)
""" """
self.identifier = identifier self.identifier = identifier
self.value = value self.value = value
self.found = found self.found = found
self.normalized_value = str(int(value, 0)) try:
self.normalized_value = str(int(value, 0))
except ValueException:
raise ValueError('Invalid "value", not aid number, got: \"%s\"' % value)
# Where we calculate the friendly name # Where we calculate the friendly name
friendly = identifier[len(AID.PREFIX):].lower() friendly = identifier[len(AID.PREFIX):].lower()
self.friendly = AID._fixup_friendly(friendly) self.friendly = AID._fixup_friendly(friendly)
if len(self.friendly) > 31:
raise ValueError('AID names must be under 32 characters "%s"' % self.friendly)
def __eq__(self, other): def __eq__(self, other):
return self.identifier == other.identifier \ return self.identifier == other.identifier \
@ -639,10 +648,8 @@ class FSConfigFileParser(object):
try: try:
aid = AID(section_name, value, file_name) aid = AID(section_name, value, file_name)
except ValueError: except ValueError as exception:
sys.exit( sys.exit(error_message(exception))
error_message('Invalid "value", not aid number, got: \"%s\"' %
value))
# Values must be within OEM range # Values must be within OEM range
if not Utils.in_any_range(int(aid.value, 0), self._oem_ranges): if not Utils.in_any_range(int(aid.value, 0), self._oem_ranges):