projects
/
openssl.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Ensure we check i2d_X509 return val
[openssl.git]
/
crypto
/
x509
/
x_x509.c
diff --git
a/crypto/x509/x_x509.c
b/crypto/x509/x_x509.c
index 34639555baae981ffc39ead5e9dd382670a39171..22a7e5922d421e6125e1e3f45c0486c2701772b3 100644
(file)
--- a/
crypto/x509/x_x509.c
+++ b/
crypto/x509/x_x509.c
@@
-182,10
+182,19
@@
X509 *d2i_X509_AUX(X509 **a, const unsigned char **pp, long length)
int i2d_X509_AUX(X509 *a, unsigned char **pp)
{
int i2d_X509_AUX(X509 *a, unsigned char **pp)
{
- int length;
+ int length, tmplen;
+ unsigned char *start = *pp;
length = i2d_X509(a, pp);
length = i2d_X509(a, pp);
- if (a)
- length += i2d_X509_CERT_AUX(a->aux, pp);
+ if (length < 0 || a == NULL)
+ return length;
+
+ tmplen = i2d_X509_CERT_AUX(a->aux, pp);
+ if (tmplen < 0) {
+ *pp = start;
+ return tmplen;
+ }
+ length += tmplen;
+
return length;
}
return length;
}