diff options
| author | Havoc Pennington <hp@redhat.com> | 2005-02-06 05:19:50 +0000 |
|---|---|---|
| committer | Havoc Pennington <hp@redhat.com> | 2005-02-06 05:19:50 +0000 |
| commit | 96a47516321dea8c08e1ab15ac0102ce3c3ae3f1 (patch) | |
| tree | e0288218038a701393727546fd275cb1377fdda4 /dbus/dbus-marshal-validate.h | |
| parent | 8f04e1e01f51fa9bef564dbaf29be59694407d21 (diff) | |
2005-02-06 Havoc Pennington <hp@redhat.com>
* dbus/dbus-message-factory.c (generate_special): more tests
* dbus/dbus-marshal-validate.c (validate_body_helper): detect
array length that exceeds the maximum
Diffstat (limited to 'dbus/dbus-marshal-validate.h')
| -rw-r--r-- | dbus/dbus-marshal-validate.h | 45 |
1 files changed, 23 insertions, 22 deletions
diff --git a/dbus/dbus-marshal-validate.h b/dbus/dbus-marshal-validate.h index 8989d508..74f4bbf2 100644 --- a/dbus/dbus-marshal-validate.h +++ b/dbus/dbus-marshal-validate.h @@ -55,7 +55,9 @@ typedef enum DBUS_VALID = 0, DBUS_INVALID_UNKNOWN_TYPECODE = 1, DBUS_INVALID_MISSING_ARRAY_ELEMENT_TYPE = 2, - DBUS_INVALID_SIGNATURE_TOO_LONG = 3, + DBUS_INVALID_SIGNATURE_TOO_LONG = 3, /* this one is impossible right now since + * you can't put a too-long value in a byte + */ DBUS_INVALID_EXCEEDED_MAXIMUM_ARRAY_RECURSION = 4, DBUS_INVALID_EXCEEDED_MAXIMUM_STRUCT_RECURSION = 5, DBUS_INVALID_STRUCT_ENDED_BUT_NOT_STARTED = 6, @@ -87,27 +89,26 @@ typedef enum DBUS_INVALID_MISSING_MEMBER = 32, DBUS_INVALID_MISSING_ERROR_NAME = 33, DBUS_INVALID_MISSING_REPLY_SERIAL = 34, - DBUS_INVALID_STRING_LENGTH_OUT_OF_BOUNDS = 35, - DBUS_INVALID_ARRAY_LENGTH_OUT_OF_BOUNDS = 36, - DBUS_INVALID_ARRAY_LENGTH_EXCEEDS_MAXIMUM = 37, - DBUS_INVALID_BAD_PATH = 38, - DBUS_INVALID_SIGNATURE_LENGTH_OUT_OF_BOUNDS = 39, - DBUS_INVALID_BAD_UTF8_IN_STRING = 40, - DBUS_INVALID_ARRAY_LENGTH_INCORRECT = 41, - DBUS_INVALID_VARIANT_SIGNATURE_LENGTH_OUT_OF_BOUNDS = 42, - DBUS_INVALID_VARIANT_SIGNATURE_BAD = 43, - DBUS_INVALID_VARIANT_SIGNATURE_EMPTY = 44, - DBUS_INVALID_VARIANT_SIGNATURE_SPECIFIES_MULTIPLE_VALUES = 45, - DBUS_INVALID_VARIANT_SIGNATURE_MISSING_NUL = 46, - DBUS_INVALID_STRING_MISSING_NUL = 47, - DBUS_INVALID_SIGNATURE_MISSING_NUL = 48, - DBUS_INVALID_EXCEEDED_MAXIMUM_DICT_ENTRY_RECURSION = 49, - DBUS_INVALID_DICT_ENTRY_ENDED_BUT_NOT_STARTED = 50, - DBUS_INVALID_DICT_ENTRY_STARTED_BUT_NOT_ENDED = 51, - DBUS_INVALID_DICT_ENTRY_HAS_NO_FIELDS = 52, - DBUS_INVALID_DICT_ENTRY_HAS_ONLY_ONE_FIELD = 53, - DBUS_INVALID_DICT_ENTRY_HAS_TOO_MANY_FIELDS = 54, - DBUS_INVALID_DICT_ENTRY_NOT_INSIDE_ARRAY = 55, + DBUS_INVALID_LENGTH_OUT_OF_BOUNDS = 35, + DBUS_INVALID_ARRAY_LENGTH_EXCEEDS_MAXIMUM = 36, + DBUS_INVALID_BAD_PATH = 37, + DBUS_INVALID_SIGNATURE_LENGTH_OUT_OF_BOUNDS = 38, + DBUS_INVALID_BAD_UTF8_IN_STRING = 39, + DBUS_INVALID_ARRAY_LENGTH_INCORRECT = 40, + DBUS_INVALID_VARIANT_SIGNATURE_LENGTH_OUT_OF_BOUNDS = 41, + DBUS_INVALID_VARIANT_SIGNATURE_BAD = 42, + DBUS_INVALID_VARIANT_SIGNATURE_EMPTY = 43, + DBUS_INVALID_VARIANT_SIGNATURE_SPECIFIES_MULTIPLE_VALUES = 44, + DBUS_INVALID_VARIANT_SIGNATURE_MISSING_NUL = 45, + DBUS_INVALID_STRING_MISSING_NUL = 46, + DBUS_INVALID_SIGNATURE_MISSING_NUL = 47, + DBUS_INVALID_EXCEEDED_MAXIMUM_DICT_ENTRY_RECURSION = 48, + DBUS_INVALID_DICT_ENTRY_ENDED_BUT_NOT_STARTED = 49, + DBUS_INVALID_DICT_ENTRY_STARTED_BUT_NOT_ENDED = 50, + DBUS_INVALID_DICT_ENTRY_HAS_NO_FIELDS = 51, + DBUS_INVALID_DICT_ENTRY_HAS_ONLY_ONE_FIELD = 52, + DBUS_INVALID_DICT_ENTRY_HAS_TOO_MANY_FIELDS = 53, + DBUS_INVALID_DICT_ENTRY_NOT_INSIDE_ARRAY = 54, DBUS_VALIDITY_LAST } DBusValidity; |