diff options
author | Brian Carlstrom <bdc@google.com> | 2014-07-30 16:30:10 +0000 |
---|---|---|
committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2014-07-30 16:17:48 +0000 |
commit | 073dc97cf2d8417709f4c77808a4cd6e8f17575e (patch) | |
tree | 59cbf635c6ab3da88783235e81af2d639450dd6a | |
parent | 7a739f35857f7c3b7d2de24c56c6eb86bc4818d7 (diff) | |
parent | dad2ab4df403125873940d50c80f2db8217b4916 (diff) | |
download | build-073dc97cf2d8417709f4c77808a4cd6e8f17575e.tar.gz |
Merge "Add PROP_NAME_MAX validation"
-rwxr-xr-x | tools/post_process_props.py | 12 |
1 files changed, 9 insertions, 3 deletions
diff --git a/tools/post_process_props.py b/tools/post_process_props.py index 5d1b350ecb..32a90bc1a4 100755 --- a/tools/post_process_props.py +++ b/tools/post_process_props.py @@ -16,9 +16,10 @@ import sys -# See PROP_VALUE_MAX system_properties.h. -# PROP_VALUE_MAX in system_properties.h includes the termination NUL, -# so we decrease it by 1 here. +# See PROP_NAME_MAX and PROP_VALUE_MAX system_properties.h. +# The constants in system_properties.h includes the termination NUL, +# so we decrease the values by 1 here. +PROP_NAME_MAX = 31 PROP_VALUE_MAX = 91 # Put the modifications that you need to make into the /system/build.prop into this @@ -56,6 +57,11 @@ def validate(prop): "").startswith("eng") for key, value in buildprops.iteritems(): # Check build properties' length. + if len(key) > PROP_NAME_MAX: + check_pass = False + sys.stderr.write("error: %s cannot exceed %d bytes: " % + (key, PROP_NAME_MAX)) + sys.stderr.write("%s (%d)\n" % (key, len(key))) if len(value) > PROP_VALUE_MAX: # If dev build, show a warning message, otherwise fail the # build with error message |