diff options
| author | Matthew Leeds <matthew.leeds@endlessm.com> | 2018-03-28 23:11:50 -0700 |
|---|---|---|
| committer | Atomic Bot <atomic-devel@projectatomic.io> | 2018-03-29 13:45:26 +0000 |
| commit | 9721be34e161ff5b2d699c52e1add633e8c33347 (patch) | |
| tree | 853148522b76386702dd055c25b31f22bf111194 | |
| parent | 2be4631738aaaad27d7689a6e6118c78659b5579 (diff) | |
| download | ostree-9721be34e161ff5b2d699c52e1add633e8c33347.tar.gz | |
libotutil/checksum-utils: Fix memory management
Ostree uses the OtChecksum data structure as a wrapper around GChecksum
(depending on what libraries are available at compile time). According
to the docs for g_checksum_get_digest(), a GChecksum value can no longer
be updated after that function is called. Ostree enforces this by
setting "initialized" to FALSE after getting the digest, but this leads
to ot_checksum_clear() avoiding freeing any memory, leading to leaks. So
this commit adds a "closed" value that gets set when getting a digest
and checked when updating the value, so the initialized value can be
used only for memory management.
Closes: #1521
Approved by: jlebon
| -rw-r--r-- | src/libotutil/ot-checksum-utils.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/src/libotutil/ot-checksum-utils.c b/src/libotutil/ot-checksum-utils.c index 6e0e5641..6eb6fdc0 100644 --- a/src/libotutil/ot-checksum-utils.c +++ b/src/libotutil/ot-checksum-utils.c @@ -54,6 +54,7 @@ ot_bin2hex (char *out_buf, const guint8 *inbuf, gsize len) */ typedef struct { gboolean initialized; + gboolean closed; #if defined(HAVE_OPENSSL) EVP_MD_CTX *checksum; #elif defined(HAVE_GNUTLS) @@ -84,6 +85,7 @@ ot_checksum_init (OtChecksum *checksum) real->digest_len = g_checksum_type_get_length (G_CHECKSUM_SHA256); #endif g_assert_cmpint (real->digest_len, ==, _OSTREE_SHA256_DIGEST_LEN); + real->closed = FALSE; real->initialized = TRUE; } @@ -94,6 +96,7 @@ ot_checksum_update (OtChecksum *checksum, { OtRealChecksum *real = (OtRealChecksum*)checksum; g_return_if_fail (real->initialized); + g_return_if_fail (!real->closed); #if defined(HAVE_OPENSSL) g_assert (EVP_DigestUpdate (real->checksum, buf, len)); #elif defined(HAVE_GNUTLS) @@ -130,7 +133,7 @@ ot_checksum_get_digest (OtChecksum *checksum, { OtRealChecksum *real = (OtRealChecksum*)checksum; ot_checksum_get_digest_internal (real, buf, buflen); - real->initialized = FALSE; + real->closed = TRUE; } void @@ -143,7 +146,6 @@ ot_checksum_get_hexdigest (OtChecksum *checksum, guint8 digest_buf[digest_len]; ot_checksum_get_digest (checksum, digest_buf, digest_len); ot_bin2hex (buf, (guint8*)digest_buf, digest_len); - real->initialized = FALSE; } void |