diff options
author | Jakub Grajciar <jgrajcia@cisco.com> | 2020-02-07 11:30:26 +0100 |
---|---|---|
committer | Ole Trøan <otroan@employees.org> | 2020-02-26 08:51:03 +0000 |
commit | 2dbee9361e74d03727a8b618ba80a5e28c006011 (patch) | |
tree | 443b6c39e99e0e46b62ef0dfd002e31bb1fa7665 /src/vlibapi/api_types.h | |
parent | 8e755a16a71c55555f12381c8a12e22ae7138536 (diff) |
api: improve api string safety
- Remove vl_api_from_api_string
to prevent use of not nul-terminated strings.
- Rename vl_api_from_api_to_vec -> vl_api_from_api_to_new_vec
to imply a new vector is created. NOT nul terminated.
- Add vl_api_from_api_to_new_c_string. Returns
nul terminated string in a new vector.
- Add vl_api_c_string_to_api_string. Convert nul terminated
string to vl_api_string_t
- Add vl_api_vec_to_api_string. Convert NON nul terminated
vector to vl_api_string_t
Type: fix
Signed-off-by: Jakub Grajciar <jgrajcia@cisco.com>
Change-Id: Iadd59b612c0d960a34ad0dd07a9d17f56435c6ea
Signed-off-by: Jakub Grajciar <jgrajcia@cisco.com>
Diffstat (limited to 'src/vlibapi/api_types.h')
-rw-r--r-- | src/vlibapi/api_types.h | 13 |
1 files changed, 10 insertions, 3 deletions
diff --git a/src/vlibapi/api_types.h b/src/vlibapi/api_types.h index 8cd47bb770f..21fcde53b0e 100644 --- a/src/vlibapi/api_types.h +++ b/src/vlibapi/api_types.h @@ -38,11 +38,18 @@ typedef struct u8 buf[0]; } __attribute__ ((packed)) vl_api_string_t; -extern int vl_api_to_api_string (u32 len, const char *buf, vl_api_string_t * str); +/* Nul terminated string to vl_api_string_t */ +extern int vl_api_c_string_to_api_string (const char *buf, vl_api_string_t * str); +/* NON nul terminated vector to vl_api_string_t */ extern int vl_api_vec_to_api_string (const u8 *vec, vl_api_string_t * str); -extern u8 * vl_api_from_api_string (vl_api_string_t * astr); + extern u32 vl_api_string_len (vl_api_string_t * astr); -extern u8 * vl_api_from_api_to_vec (vl_api_string_t *astr); + +/* Returns new vector. NON nul terminated */ +extern u8 * vl_api_from_api_to_new_vec (vl_api_string_t *astr); +/* Returns new vector. Nul terminated */ +extern char * vl_api_from_api_to_new_c_string (vl_api_string_t *astr); + extern u8 *vl_api_format_string (u8 *s, va_list *args); #ifdef __cplusplus |