luc14n0/glib
1
0
Fork 0
mirror of https://gitlab.gnome.org/GNOME/glib.git synced 2024-11-13 12:56:15 +01:00
Code Issues Packages Projects Releases Wiki Activity

ghmac: Fix some signed/unsigned issues with g_checksum_type_get_length()

Browse Source 
As with the previous commit, the return value from
`g_checksum_type_get_length()` is signed, but some of the `GHmac` code
was treating it as unsigned.

Add some assertions to make it clearer to static analysis that this is
OK because `GHmac` only ever calls it after validating its input, so
it’s guaranteed to never return a negative number.

Signed-off-by: Philip Withnall <pwithnall@endlessos.org>
This commit is contained in:
Philip Withnall 2022-05-05 13:24:44 +01:00
parent a3911ef159
commit 977756590c
1 changed files with 14 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
glib/ghmac.c
View File

@ -289,11 +289,17 @@ const gchar *
g_hmac_get_string (GHmac *hmac) g_hmac_get_string (GHmac *hmac)
{ {
guint8 *buffer; guint8 *buffer;
gssize digest_len_signed;
gsize digest_len; gsize digest_len;
g_return_val_if_fail (hmac != NULL, NULL); g_return_val_if_fail (hmac != NULL, NULL);
digest_len = g_checksum_type_get_length (hmac->digest_type); /* It shouldn’t be possible for @digest_len_signed to be negative, as
* `hmac->digest_type` has already been validated as being supported. */
digest_len_signed = g_checksum_type_get_length (hmac->digest_type);
g_assert (digest_len_signed >= 0);
digest_len = digest_len_signed;
buffer = g_alloca (digest_len); buffer = g_alloca (digest_len);
/* This is only called for its side-effect of updating hmac->digesto... */ /* This is only called for its side-effect of updating hmac->digesto... */
@ -329,7 +335,13 @@ g_hmac_get_digest (GHmac *hmac,
g_return_if_fail (hmac != NULL); g_return_if_fail (hmac != NULL);
len = g_checksum_type_get_length (hmac->digest_type); /* It shouldn’t be possible for @len_signed to be negative, as
* `hmac->digest_type` has already been validated as being supported. */
len_signed = g_checksum_type_get_length (hmac->digest_type);
g_assert (len_signed >= 0);
len = len_signed;
/* @buffer must be long enough for the digest */
g_return_if_fail (*digest_len >= len); g_return_if_fail (*digest_len >= len);
/* Use the same buffer, because we can :) */ /* Use the same buffer, because we can :) */