diff options
| author |   miod <miod@openbsd.org> | 2014-05-18 19:35:04 +0000 |
|---|---|---|
| committer | miod <miod@openbsd.org> | 2014-05-18 19:35:04 +0000 |
| commit | 89e34462d6c789038010ea62344815cd8fa9f3c1 (patch) | |
| tree | db58e93771352ebbb75c7d416802f0ac452890a7 /lib/libssl/src | |
| parent | Make sure UTF8_getc() is invoked with the proper buffer size. (diff) | |
| download | wireguard-openbsd-89e34462d6c789038010ea62344815cd8fa9f3c1.tar.xz wireguard-openbsd-89e34462d6c789038010ea62344815cd8fa9f3c1.zip | |
If you need to allocate `a + b' bytes of memory, then don't allocate `a + b*2',
this is confusing and unnecessary.
Help (coz I got confused) and ok guenther@ beck@
Diffstat (limited to 'lib/libssl/src')
| -rw-r--r-- | lib/libssl/src/crypto/asn1/f_enum.c | 4 | ||||
| -rw-r--r-- | lib/libssl/src/crypto/asn1/f_int.c | 4 | ||||
| -rw-r--r-- | lib/libssl/src/crypto/asn1/f_string.c | 4 |
3 files changed, 6 insertions, 6 deletions
diff --git a/lib/libssl/src/crypto/asn1/f_enum.c b/lib/libssl/src/crypto/asn1/f_enum.c index c7b81ccbc95..14b609ebc8e 100644 --- a/lib/libssl/src/crypto/asn1/f_enum.c +++ b/lib/libssl/src/crypto/asn1/f_enum.c @@ -154,14 +154,14 @@ a2i_ASN1_ENUMERATED(BIO *bp, ASN1_ENUMERATED *bs, char *buf, int size) } i /= 2; if (num + i > slen) { - sp = realloc(s, (unsigned int)num + i * 2); + sp = realloc(s, (unsigned int)num + i); if (sp == NULL) { ASN1err(ASN1_F_A2I_ASN1_ENUMERATED, ERR_R_MALLOC_FAILURE); goto err; } s = sp; - slen = num + i * 2; + slen = num + i; } for (j = 0; j < i; j++, k += 2) { for (n = 0; n < 2; n++) { diff --git a/lib/libssl/src/crypto/asn1/f_int.c b/lib/libssl/src/crypto/asn1/f_int.c index 283860d72d5..192e2f374f4 100644 --- a/lib/libssl/src/crypto/asn1/f_int.c +++ b/lib/libssl/src/crypto/asn1/f_int.c @@ -158,14 +158,14 @@ a2i_ASN1_INTEGER(BIO *bp, ASN1_INTEGER *bs, char *buf, int size) } i /= 2; if (num + i > slen) { - sp = OPENSSL_realloc_clean(s, slen, num + i * 2); + sp = OPENSSL_realloc_clean(s, slen, num + i); if (sp == NULL) { ASN1err(ASN1_F_A2I_ASN1_INTEGER, ERR_R_MALLOC_FAILURE); goto err; } s = sp; - slen = num + i * 2; + slen = num + i; } for (j = 0; j < i; j++, k += 2) { for (n = 0; n < 2; n++) { diff --git a/lib/libssl/src/crypto/asn1/f_string.c b/lib/libssl/src/crypto/asn1/f_string.c index 0a1f136b4e7..163fca08c1d 100644 --- a/lib/libssl/src/crypto/asn1/f_string.c +++ b/lib/libssl/src/crypto/asn1/f_string.c @@ -150,14 +150,14 @@ a2i_ASN1_STRING(BIO *bp, ASN1_STRING *bs, char *buf, int size) } i /= 2; if (num + i > slen) { - sp = realloc(s, (unsigned int)num + i * 2); + sp = realloc(s, (unsigned int)num + i); if (sp == NULL) { ASN1err(ASN1_F_A2I_ASN1_STRING, ERR_R_MALLOC_FAILURE); goto err; } s = sp; - slen = num + i * 2; + slen = num + i; } for (j = 0; j < i; j++, k += 2) { for (n = 0; n < 2; n++) { |