From 2d694836a66c678cbde2a9299baa721158690b0b Mon Sep 17 00:00:00 2001 From: Denis Kenzior Date: Thu, 19 Nov 2015 16:29:22 -0600 Subject: gril: Add parcel skip string --- gril/parcel.c | 21 +++++++++++++++++++++ gril/parcel.h | 1 + 2 files changed, 22 insertions(+) diff --git a/gril/parcel.c b/gril/parcel.c index 1cd8c8ee..96e3fbb4 100644 --- a/gril/parcel.c +++ b/gril/parcel.c @@ -200,6 +200,27 @@ char *parcel_r_string(struct parcel *p) return ret; } +void parcel_skip_string(struct parcel *p) +{ + int len16 = parcel_r_int32(p); + int strbytes; + + if (p->malformed) + return; + + /* This is how a null string is sent */ + if (len16 < 0) + return; + + strbytes = PAD_SIZE((len16 + 1) * sizeof(char16_t)); + if (p->offset + strbytes > p->size) { + p->malformed = 1; + return; + } + + p->offset += strbytes; +} + int parcel_w_raw(struct parcel *p, const void *data, size_t len) { if (data == NULL) { diff --git a/gril/parcel.h b/gril/parcel.h index fd448117..df317c46 100644 --- a/gril/parcel.h +++ b/gril/parcel.h @@ -44,6 +44,7 @@ int32_t parcel_r_int32(struct parcel *p); int parcel_w_int32(struct parcel *p, int32_t val); int parcel_w_string(struct parcel *p, const char *str); char *parcel_r_string(struct parcel *p); +void parcel_skip_string(struct parcel *p); int parcel_w_raw(struct parcel *p, const void *data, size_t len); void *parcel_r_raw(struct parcel *p, int *len); size_t parcel_data_avail(struct parcel *p); -- cgit v1.2.3