diff options
| author | Stig Bjørlykke <stig@bjorlykke.org> | 2018-08-31 23:00:44 +0200 |
|---|---|---|
| committer | Anders Broman <a.broman58@gmail.com> | 2018-09-03 04:05:13 +0000 |
| commit | 65b342f7497825c2abc4e98c7fd9f4ff6d8ed45c (patch) | |
| tree | 3746e1055e28476a4b8ba30df6996fcd16b636c1 /epan/wslua | |
| parent | 42ad60896da6655d89c4e220a36766f121cdb856 (diff) | |
epan: Use g_base64_decode_inplace()
Replace ws_base64_decode_inplace() with g_base64_decode_inplace()
or g_base64_decode(), which was introduced in glib 2.12.
The only observed difference is a need for zero-terminate the buffer
after decoding.
Change-Id: Ia102d0d8e9bec575ffeddf448191a3f6de9fb1ed
Reviewed-on: https://code.wireshark.org/review/29382
Petri-Dish: Stig Bjørlykke <stig@bjorlykke.org>
Tested-by: Petri Dish Buildbot
Reviewed-by: Anders Broman <a.broman58@gmail.com>
Diffstat (limited to 'epan/wslua')
| -rw-r--r-- | epan/wslua/wslua_byte_array.c | 11 |
1 files changed, 5 insertions, 6 deletions
diff --git a/epan/wslua/wslua_byte_array.c b/epan/wslua/wslua_byte_array.c index c0ca4fae84..bb8bb3911b 100644 --- a/epan/wslua/wslua_byte_array.c +++ b/epan/wslua/wslua_byte_array.c @@ -18,7 +18,6 @@ #include "config.h" #include "wslua.h" -#include "wsutil/base64.h" /* WSLUA_CONTINUE_MODULE Tvb */ @@ -243,22 +242,22 @@ WSLUA_METHOD ByteArray_subset(lua_State* L) { } WSLUA_METHOD ByteArray_base64_decode(lua_State* L) { - /* Obtain a base64 decoded `ByteArray`. + /* Obtain a Base64 decoded `ByteArray`. @since 1.11.3 */ ByteArray ba = checkByteArray(L,1); ByteArray ba2; gchar *data; - size_t len; + gsize len; ba2 = g_byte_array_new(); - data = (gchar*)g_malloc (ba->len + 1); + data = (gchar*)g_malloc(ba->len + 1); memcpy(data, ba->data, ba->len); data[ba->len] = '\0'; - len = ws_base64_decode_inplace(data); - g_byte_array_append(ba2,data,(int)len); + g_base64_decode_inplace(data, &len); + g_byte_array_append(ba2, data, (int)len); g_free(data); pushByteArray(L,ba2); |