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@
author: miod <> 2014-05-18 19:35:04 +0000
committer: miod <> 2014-05-18 19:35:04 +0000
commit: 68e33037c2e3ee88c2f07e6259cb0ec3c5a5e54f (patch)
tree: cdc617af7478edf94a172ec79d4d1e5bd9546cb3
parent: 085e31a6cf677e0452c0ba970c49088ace77d564 (diff)
download: openbsd-68e33037c2e3ee88c2f07e6259cb0ec3c5a5e54f.tar.gz
openbsd-68e33037c2e3ee88c2f07e6259cb0ec3c5a5e54f.tar.bz2
openbsd-68e33037c2e3ee88c2f07e6259cb0ec3c5a5e54f.zip
6 files changed, 12 insertions, 12 deletions
diff --git a/src/lib/libcrypto/asn1/f_enum.c b/src/lib/libcrypto/asn1/f_enum.c
index c7b81ccbc9..14b609ebc8 100644
--- a/src/lib/libcrypto/asn1/f_enum.c
+++ b/src/lib/libcrypto/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/src/lib/libcrypto/asn1/f_int.c b/src/lib/libcrypto/asn1/f_int.c
index 283860d72d..192e2f374f 100644
--- a/src/lib/libcrypto/asn1/f_int.c
+++ b/src/lib/libcrypto/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/src/lib/libcrypto/asn1/f_string.c b/src/lib/libcrypto/asn1/f_string.c
index 0a1f136b4e..163fca08c1 100644
--- a/src/lib/libcrypto/asn1/f_string.c
+++ b/src/lib/libcrypto/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++) {
diff --git a/src/lib/libssl/src/crypto/asn1/f_enum.c b/src/lib/libssl/src/crypto/asn1/f_enum.c
index c7b81ccbc9..14b609ebc8 100644
--- a/src/lib/libssl/src/crypto/asn1/f_enum.c
+++ b/src/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/src/lib/libssl/src/crypto/asn1/f_int.c b/src/lib/libssl/src/crypto/asn1/f_int.c
index 283860d72d..192e2f374f 100644
--- a/src/lib/libssl/src/crypto/asn1/f_int.c
+++ b/src/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/src/lib/libssl/src/crypto/asn1/f_string.c b/src/lib/libssl/src/crypto/asn1/f_string.c
index 0a1f136b4e..163fca08c1 100644
--- a/src/lib/libssl/src/crypto/asn1/f_string.c
+++ b/src/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++) {
author	miod <>	2014-05-18 19:35:04 +0000
committer	miod <>	2014-05-18 19:35:04 +0000
commit	68e33037c2e3ee88c2f07e6259cb0ec3c5a5e54f (patch)
tree	cdc617af7478edf94a172ec79d4d1e5bd9546cb3
parent	085e31a6cf677e0452c0ba970c49088ace77d564 (diff)
download	openbsd-68e33037c2e3ee88c2f07e6259cb0ec3c5a5e54f.tar.gz openbsd-68e33037c2e3ee88c2f07e6259cb0ec3c5a5e54f.tar.bz2 openbsd-68e33037c2e3ee88c2f07e6259cb0ec3c5a5e54f.zip

diff --git a/src/lib/libcrypto/asn1/f_enum.c b/src/lib/libcrypto/asn1/f_enum.c index c7b81ccbc9..14b609ebc8 100644 --- a/src/lib/libcrypto/asn1/f_enum.c +++ b/src/lib/libcrypto/asn1/f_enum.c
@@ -154,14 +154,14 @@ a2i_ASN1_ENUMERATED(BIO bp, ASN1_ENUMERATED bs, char *buf, int size)
154	}	154	}
155	i /= 2;	155	i /= 2;
156	if (num + i > slen) {	156	if (num + i > slen) {
157	sp = realloc(s, (unsigned int)num + i * 2);	157	sp = realloc(s, (unsigned int)num + i);
158	if (sp == NULL) {	158	if (sp == NULL) {
159	ASN1err(ASN1_F_A2I_ASN1_ENUMERATED,	159	ASN1err(ASN1_F_A2I_ASN1_ENUMERATED,
160	ERR_R_MALLOC_FAILURE);	160	ERR_R_MALLOC_FAILURE);
161	goto err;	161	goto err;
162	}	162	}
163	s = sp;	163	s = sp;
164	slen = num + i * 2;	164	slen = num + i;
165	}	165	}
166	for (j = 0; j < i; j++, k += 2) {	166	for (j = 0; j < i; j++, k += 2) {
167	for (n = 0; n < 2; n++) {	167	for (n = 0; n < 2; n++) {


diff --git a/src/lib/libcrypto/asn1/f_int.c b/src/lib/libcrypto/asn1/f_int.c index 283860d72d..192e2f374f 100644 --- a/src/lib/libcrypto/asn1/f_int.c +++ b/src/lib/libcrypto/asn1/f_int.c
@@ -158,14 +158,14 @@ a2i_ASN1_INTEGER(BIO bp, ASN1_INTEGER bs, char *buf, int size)
158	}	158	}
159	i /= 2;	159	i /= 2;
160	if (num + i > slen) {	160	if (num + i > slen) {
161	sp = OPENSSL_realloc_clean(s, slen, num + i * 2);	161	sp = OPENSSL_realloc_clean(s, slen, num + i);
162	if (sp == NULL) {	162	if (sp == NULL) {
163	ASN1err(ASN1_F_A2I_ASN1_INTEGER,	163	ASN1err(ASN1_F_A2I_ASN1_INTEGER,
164	ERR_R_MALLOC_FAILURE);	164	ERR_R_MALLOC_FAILURE);
165	goto err;	165	goto err;
166	}	166	}
167	s = sp;	167	s = sp;
168	slen = num + i * 2;	168	slen = num + i;
169	}	169	}
170	for (j = 0; j < i; j++, k += 2) {	170	for (j = 0; j < i; j++, k += 2) {
171	for (n = 0; n < 2; n++) {	171	for (n = 0; n < 2; n++) {


diff --git a/src/lib/libcrypto/asn1/f_string.c b/src/lib/libcrypto/asn1/f_string.c index 0a1f136b4e..163fca08c1 100644 --- a/src/lib/libcrypto/asn1/f_string.c +++ b/src/lib/libcrypto/asn1/f_string.c
@@ -150,14 +150,14 @@ a2i_ASN1_STRING(BIO bp, ASN1_STRING bs, char *buf, int size)
150	}	150	}
151	i /= 2;	151	i /= 2;
152	if (num + i > slen) {	152	if (num + i > slen) {
153	sp = realloc(s, (unsigned int)num + i * 2);	153	sp = realloc(s, (unsigned int)num + i);
154	if (sp == NULL) {	154	if (sp == NULL) {
155	ASN1err(ASN1_F_A2I_ASN1_STRING,	155	ASN1err(ASN1_F_A2I_ASN1_STRING,
156	ERR_R_MALLOC_FAILURE);	156	ERR_R_MALLOC_FAILURE);
157	goto err;	157	goto err;
158	}	158	}
159	s = sp;	159	s = sp;
160	slen = num + i * 2;	160	slen = num + i;
161	}	161	}
162	for (j = 0; j < i; j++, k += 2) {	162	for (j = 0; j < i; j++, k += 2) {
163	for (n = 0; n < 2; n++) {	163	for (n = 0; n < 2; n++) {


diff --git a/src/lib/libssl/src/crypto/asn1/f_enum.c b/src/lib/libssl/src/crypto/asn1/f_enum.c index c7b81ccbc9..14b609ebc8 100644 --- a/src/lib/libssl/src/crypto/asn1/f_enum.c +++ b/src/lib/libssl/src/crypto/asn1/f_enum.c
@@ -154,14 +154,14 @@ a2i_ASN1_ENUMERATED(BIO bp, ASN1_ENUMERATED bs, char *buf, int size)
154	}	154	}
155	i /= 2;	155	i /= 2;
156	if (num + i > slen) {	156	if (num + i > slen) {
157	sp = realloc(s, (unsigned int)num + i * 2);	157	sp = realloc(s, (unsigned int)num + i);
158	if (sp == NULL) {	158	if (sp == NULL) {
159	ASN1err(ASN1_F_A2I_ASN1_ENUMERATED,	159	ASN1err(ASN1_F_A2I_ASN1_ENUMERATED,
160	ERR_R_MALLOC_FAILURE);	160	ERR_R_MALLOC_FAILURE);
161	goto err;	161	goto err;
162	}	162	}
163	s = sp;	163	s = sp;
164	slen = num + i * 2;	164	slen = num + i;
165	}	165	}
166	for (j = 0; j < i; j++, k += 2) {	166	for (j = 0; j < i; j++, k += 2) {
167	for (n = 0; n < 2; n++) {	167	for (n = 0; n < 2; n++) {


diff --git a/src/lib/libssl/src/crypto/asn1/f_int.c b/src/lib/libssl/src/crypto/asn1/f_int.c index 283860d72d..192e2f374f 100644 --- a/src/lib/libssl/src/crypto/asn1/f_int.c +++ b/src/lib/libssl/src/crypto/asn1/f_int.c
@@ -158,14 +158,14 @@ a2i_ASN1_INTEGER(BIO bp, ASN1_INTEGER bs, char *buf, int size)
158	}	158	}
159	i /= 2;	159	i /= 2;
160	if (num + i > slen) {	160	if (num + i > slen) {
161	sp = OPENSSL_realloc_clean(s, slen, num + i * 2);	161	sp = OPENSSL_realloc_clean(s, slen, num + i);
162	if (sp == NULL) {	162	if (sp == NULL) {
163	ASN1err(ASN1_F_A2I_ASN1_INTEGER,	163	ASN1err(ASN1_F_A2I_ASN1_INTEGER,
164	ERR_R_MALLOC_FAILURE);	164	ERR_R_MALLOC_FAILURE);
165	goto err;	165	goto err;
166	}	166	}
167	s = sp;	167	s = sp;
168	slen = num + i * 2;	168	slen = num + i;
169	}	169	}
170	for (j = 0; j < i; j++, k += 2) {	170	for (j = 0; j < i; j++, k += 2) {
171	for (n = 0; n < 2; n++) {	171	for (n = 0; n < 2; n++) {


diff --git a/src/lib/libssl/src/crypto/asn1/f_string.c b/src/lib/libssl/src/crypto/asn1/f_string.c index 0a1f136b4e..163fca08c1 100644 --- a/src/lib/libssl/src/crypto/asn1/f_string.c +++ b/src/lib/libssl/src/crypto/asn1/f_string.c
@@ -150,14 +150,14 @@ a2i_ASN1_STRING(BIO bp, ASN1_STRING bs, char *buf, int size)
150	}	150	}
151	i /= 2;	151	i /= 2;
152	if (num + i > slen) {	152	if (num + i > slen) {
153	sp = realloc(s, (unsigned int)num + i * 2);	153	sp = realloc(s, (unsigned int)num + i);
154	if (sp == NULL) {	154	if (sp == NULL) {
155	ASN1err(ASN1_F_A2I_ASN1_STRING,	155	ASN1err(ASN1_F_A2I_ASN1_STRING,
156	ERR_R_MALLOC_FAILURE);	156	ERR_R_MALLOC_FAILURE);
157	goto err;	157	goto err;
158	}	158	}
159	s = sp;	159	s = sp;
160	slen = num + i * 2;	160	slen = num + i;
161	}	161	}
162	for (j = 0; j < i; j++, k += 2) {	162	for (j = 0; j < i; j++, k += 2) {
163	for (n = 0; n < 2; n++) {	163	for (n = 0; n < 2; n++) {