luc14n0/glib
1
0
Fork 0
mirror of https://gitlab.gnome.org/GNOME/glib.git synced 2025-12-24 00:39:24 +01:00
Code Issues Packages Projects Releases Wiki Activity

base64: remove unnecessary assertions

Browse Source 
Allow base64 encoding/decoding of empty strings.
This commit is contained in:
Ryan Lortie
2010-07-07 22:00:43 -04:00
parent ddb919245c
commit a00fa340cb
1 changed files with 1 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
glib/gbase64.c
View File

@@ -254,8 +254,7 @@ g_base64_encode (const guchar *data,
gint state = 0, outlen; gint state = 0, outlen;
gint save = 0; gint save = 0;
g_return_val_if_fail (data != NULL, NULL); g_return_val_if_fail (data != NULL || len == 0, NULL);
g_return_val_if_fail (len > 0, NULL);
/* We can use a smaller limit here, since we know the saved state is 0, /* We can use a smaller limit here, since we know the saved state is 0,
+1 is needed for trailing \0, also check for unlikely integer overflow */ +1 is needed for trailing \0, also check for unlikely integer overflow */
@@ -398,8 +397,6 @@ g_base64_decode (const gchar *text,
input_length = strlen (text); input_length = strlen (text);
g_return_val_if_fail (input_length > 1, NULL);
/* We can use a smaller limit here, since we know the saved state is 0, /* We can use a smaller limit here, since we know the saved state is 0,
+1 used to avoid calling g_malloc0(0), and hence retruning NULL */ +1 used to avoid calling g_malloc0(0), and hence retruning NULL */
ret = g_malloc0 ((input_length / 4) * 3 + 1); ret = g_malloc0 ((input_length / 4) * 3 + 1);