diff options
| author | Havoc Pennington <hp@redhat.com> | 2005-02-06 04:21:57 +0000 |
|---|---|---|
| committer | Havoc Pennington <hp@redhat.com> | 2005-02-06 04:21:57 +0000 |
| commit | 8f04e1e01f51fa9bef564dbaf29be59694407d21 (patch) | |
| tree | 316da5fb825566b282c375bf54b05744807f3c2e /dbus/dbus-marshal-validate.h | |
| parent | 0e53d4eed36f378e99802e516fbb0d1355641902 (diff) | |
2005-02-05 Havoc Pennington <hp@redhat.com>
* dbus/dbus-message-factory.c (generate_special): more test cases,
increasing coverage
* dbus/dbus-marshal-validate.c (validate_body_helper): return the
reason why a signature was invalid
* dbus/dbus-marshal-header.c (load_and_validate_field): fix to
skip the length of the string before we look at it in validation
* dbus/dbus-string-util.c (_dbus_string_test): add tests for
equal_substring
* dbus/dbus-message.c (_dbus_message_loader_new): default
max_message_length to DBUS_MAXIMUM_MESSAGE_LENGTH
Diffstat (limited to 'dbus/dbus-marshal-validate.h')
| -rw-r--r-- | dbus/dbus-marshal-validate.h | 35 |
1 files changed, 18 insertions, 17 deletions
diff --git a/dbus/dbus-marshal-validate.h b/dbus/dbus-marshal-validate.h index 55739d31..8989d508 100644 --- a/dbus/dbus-marshal-validate.h +++ b/dbus/dbus-marshal-validate.h @@ -48,6 +48,7 @@ typedef enum */ typedef enum { +#define _DBUS_NEGATIVE_VALIDITY_COUNT 3 DBUS_INVALID_FOR_UNKNOWN_REASON = -3, DBUS_VALID_BUT_INCOMPLETE = -2, DBUS_VALIDITY_UNKNOWN = -1, @@ -91,23 +92,23 @@ typedef enum DBUS_INVALID_ARRAY_LENGTH_EXCEEDS_MAXIMUM = 37, DBUS_INVALID_BAD_PATH = 38, DBUS_INVALID_SIGNATURE_LENGTH_OUT_OF_BOUNDS = 39, - DBUS_INVALID_BAD_SIGNATURE = 40, - DBUS_INVALID_BAD_UTF8_IN_STRING = 41, - DBUS_INVALID_ARRAY_LENGTH_INCORRECT = 42, - DBUS_INVALID_VARIANT_SIGNATURE_LENGTH_OUT_OF_BOUNDS = 43, - DBUS_INVALID_VARIANT_SIGNATURE_BAD = 44, - DBUS_INVALID_VARIANT_SIGNATURE_EMPTY = 45, - DBUS_INVALID_VARIANT_SIGNATURE_SPECIFIES_MULTIPLE_VALUES = 46, - DBUS_INVALID_VARIANT_SIGNATURE_MISSING_NUL = 47, - DBUS_INVALID_STRING_MISSING_NUL = 48, - DBUS_INVALID_SIGNATURE_MISSING_NUL = 49, - DBUS_INVALID_EXCEEDED_MAXIMUM_DICT_ENTRY_RECURSION = 50, - DBUS_INVALID_DICT_ENTRY_ENDED_BUT_NOT_STARTED = 51, - DBUS_INVALID_DICT_ENTRY_STARTED_BUT_NOT_ENDED = 52, - DBUS_INVALID_DICT_ENTRY_HAS_NO_FIELDS = 53, - DBUS_INVALID_DICT_ENTRY_HAS_ONLY_ONE_FIELD = 54, - DBUS_INVALID_DICT_ENTRY_HAS_TOO_MANY_FIELDS = 55, - DBUS_INVALID_DICT_ENTRY_NOT_INSIDE_ARRAY = 56 + 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_VALIDITY_LAST } DBusValidity; DBusValidity _dbus_validate_signature_with_reason (const DBusString *type_str, |