X-Git-Url: http://review.tizen.org/git/?a=blobdiff_plain;ds=sidebyside;f=dbus%2Fdbus-marshal-validate.h;h=06434201a23eca163366fa6254f072a75e37b09f;hb=1200c464b6c9051340960e07f0d61a51dad71286;hp=195f46da31b8573b8a9e96554235e71f706c1372;hpb=9d21554dd3b560952cd5aa607c4ec07898c0b260;p=platform%2Fupstream%2Fdbus.git diff --git a/dbus/dbus-marshal-validate.h b/dbus/dbus-marshal-validate.h index 195f46d..0643420 100644 --- a/dbus/dbus-marshal-validate.h +++ b/dbus/dbus-marshal-validate.h @@ -1,4 +1,4 @@ -/* -*- mode: C; c-file-style: "gnu" -*- */ +/* -*- mode: C; c-file-style: "gnu"; indent-tabs-mode: nil; -*- */ /* dbus-marshal-validate.h Validation routines for marshaled data * * Copyright (C) 2005 Red Hat, Inc. @@ -17,19 +17,18 @@ * * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA * */ #ifndef DBUS_MARSHAL_VALIDATE_H #define DBUS_MARSHAL_VALIDATE_H -#include -#include - -#ifndef PACKAGE -#error "config.h not included here" -#endif +/** + * @addtogroup DBusMarshal + * + * @{ + */ /** * This is used rather than a bool for high visibility @@ -49,13 +48,17 @@ typedef enum */ typedef enum { +#define _DBUS_NEGATIVE_VALIDITY_COUNT 4 + DBUS_VALIDITY_UNKNOWN_OOM_ERROR = -4, /**< can't determine validity due to OOM */ DBUS_INVALID_FOR_UNKNOWN_REASON = -3, DBUS_VALID_BUT_INCOMPLETE = -2, DBUS_VALIDITY_UNKNOWN = -1, - DBUS_VALID = 0, + DBUS_VALID = 0, /**< the data is valid */ 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, @@ -64,7 +67,7 @@ typedef enum DBUS_INVALID_ALIGNMENT_PADDING_NOT_NUL = 9, DBUS_INVALID_BOOLEAN_NOT_ZERO_OR_ONE = 10, DBUS_INVALID_NOT_ENOUGH_DATA = 11, - DBUS_INVALID_TOO_MUCH_DATA = 12, + DBUS_INVALID_TOO_MUCH_DATA = 12, /**< trailing junk makes it invalid */ DBUS_INVALID_BAD_BYTE_ORDER = 13, DBUS_INVALID_BAD_PROTOCOL_VERSION = 14, DBUS_INVALID_BAD_MESSAGE_TYPE = 15, @@ -87,21 +90,30 @@ 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_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_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_INVALID_DICT_KEY_MUST_BE_BASIC_TYPE = 55, + DBUS_INVALID_MISSING_UNIX_FDS = 56, + DBUS_INVALID_NESTED_TOO_DEEPLY = 57, + DBUS_VALIDITY_LAST } DBusValidity; DBusValidity _dbus_validate_signature_with_reason (const DBusString *type_str, @@ -115,6 +127,8 @@ DBusValidity _dbus_validate_body_with_reason (const DBusString *expected_si int value_pos, int len); +const char *_dbus_validity_to_error_message (DBusValidity validity); + dbus_bool_t _dbus_validate_path (const DBusString *str, int start, int len); @@ -130,9 +144,14 @@ dbus_bool_t _dbus_validate_error_name (const DBusString *str, dbus_bool_t _dbus_validate_bus_name (const DBusString *str, int start, int len); +dbus_bool_t _dbus_validate_bus_namespace (const DBusString *str, + int start, + int len); dbus_bool_t _dbus_validate_signature (const DBusString *str, int start, int len); +/* just to have a name consistent with the above: */ +#define _dbus_validate_utf8(s,b,e) _dbus_string_validate_utf8 (s, b, e) #ifdef DBUS_DISABLE_CHECKS @@ -145,7 +164,7 @@ dbus_bool_t _dbus_validate_signature (const DBusString *str, #else /* !DBUS_DISABLE_CHECKS */ /** A name check is used in _dbus_return_if_fail(), it's not suitable - * for validating untrusted data. use _dbus_validate_##what for that. + * for validating untrusted data. use _dbus_validate_whatever for that. */ #define DECLARE_DBUS_NAME_CHECK(what) \ dbus_bool_t _dbus_check_is_valid_##what (const char *name) @@ -167,11 +186,21 @@ _dbus_check_is_valid_##what (const char *name) \ } #endif /* !DBUS_DISABLE_CHECKS */ +/** defines _dbus_check_is_valid_path() */ DECLARE_DBUS_NAME_CHECK(path); +/** defines _dbus_check_is_valid_interface() */ DECLARE_DBUS_NAME_CHECK(interface); +/** defines _dbus_check_is_valid_member() */ DECLARE_DBUS_NAME_CHECK(member); +/** defines _dbus_check_is_valid_error_name() */ DECLARE_DBUS_NAME_CHECK(error_name); +/** defines _dbus_check_is_valid_bus_name() */ DECLARE_DBUS_NAME_CHECK(bus_name); +/** defines _dbus_check_is_valid_signature() */ DECLARE_DBUS_NAME_CHECK(signature); +/** defines _dbus_check_is_valid_utf8() */ +DECLARE_DBUS_NAME_CHECK(utf8); + +/** @} */ #endif /* DBUS_MARSHAL_VALIDATE_H */