static int signature_element_length_internal(
const char *s,
bool allow_dict_entry,
+ unsigned array_depth,
+ unsigned struct_depth,
size_t *l) {
int r;
if (*s == SD_BUS_TYPE_ARRAY) {
size_t t;
- r = signature_element_length_internal(s + 1, true, &t);
+ if (array_depth >= 32)
+ return -EINVAL;
+
+ r = signature_element_length_internal(s + 1, true, array_depth+1, struct_depth, &t);
if (r < 0)
return r;
if (*s == SD_BUS_TYPE_STRUCT_BEGIN) {
const char *p = s + 1;
+ if (struct_depth >= 32)
+ return -EINVAL;
+
while (*p != SD_BUS_TYPE_STRUCT_END) {
size_t t;
- r = signature_element_length_internal(p, false, &t);
+ r = signature_element_length_internal(p, false, array_depth, struct_depth+1, &t);
if (r < 0)
return r;
const char *p = s + 1;
unsigned n = 0;
+ if (struct_depth >= 32)
+ return -EINVAL;
+
while (*p != SD_BUS_TYPE_DICT_ENTRY_END) {
size_t t;
if (n == 0 && !bus_type_is_basic(*p))
return -EINVAL;
- r = signature_element_length_internal(p, false, &t);
+ r = signature_element_length_internal(p, false, array_depth, struct_depth+1, &t);
if (r < 0)
return r;
return -EINVAL;
}
+
+int signature_element_length(const char *s, size_t *l) {
+ return signature_element_length_internal(s, true, 0, 0, l);
+}
+
bool signature_is_single(const char *s) {
int r;
size_t t;
while (*p) {
size_t t;
- r = signature_element_length_internal(p, allow_dict_entry, &t);
+ r = signature_element_length_internal(p, allow_dict_entry, 0, 0, &t);
if (r < 0)
return false;
return p - s <= 255;
}
-
-int signature_element_length(const char *s, size_t *l) {
- return signature_element_length_internal(s, true, l);
-}