projects
/
openssl.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
remove 0 assignments.
[openssl.git]
/
crypto
/
asn1
/
a_utctm.c
diff --git
a/crypto/asn1/a_utctm.c
b/crypto/asn1/a_utctm.c
index 2dac3b58b4c629063cc6638c602c7d839cb1e4aa..9144922ab4dc2317194b2e37f6bc039fabbffa56 100644
(file)
--- a/
crypto/asn1/a_utctm.c
+++ b/
crypto/asn1/a_utctm.c
@@
-58,7
+58,7
@@
#include <stdio.h>
#include <time.h>
#include <stdio.h>
#include <time.h>
-#include "cryptlib.h"
+#include "
internal/
cryptlib.h"
#include <openssl/asn1.h>
#include "asn1_locl.h"
#include <openssl/asn1.h>
#include "asn1_locl.h"
@@
-193,11
+193,11
@@
ASN1_UTCTIME *ASN1_UTCTIME_adj(ASN1_UTCTIME *s, time_t t,
int free_s = 0;
if (s == NULL) {
int free_s = 0;
if (s == NULL) {
- free_s = 1;
s = ASN1_UTCTIME_new();
s = ASN1_UTCTIME_new();
+ if (s == NULL)
+ goto err;
+ free_s = 1;
}
}
- if (s == NULL)
- goto err;
ts = OPENSSL_gmtime(&t, &data);
if (ts == NULL)
ts = OPENSSL_gmtime(&t, &data);
if (ts == NULL)
@@
-218,8
+218,7
@@
ASN1_UTCTIME *ASN1_UTCTIME_adj(ASN1_UTCTIME *s, time_t t,
ASN1err(ASN1_F_ASN1_UTCTIME_ADJ, ERR_R_MALLOC_FAILURE);
goto err;
}
ASN1err(ASN1_F_ASN1_UTCTIME_ADJ, ERR_R_MALLOC_FAILURE);
goto err;
}
- if (s->data != NULL)
- OPENSSL_free(s->data);
+ OPENSSL_free(s->data);
s->data = (unsigned char *)p;
}
s->data = (unsigned char *)p;
}
@@
-233,7
+232,7
@@
ASN1_UTCTIME *ASN1_UTCTIME_adj(ASN1_UTCTIME *s, time_t t,
#endif
return (s);
err:
#endif
return (s);
err:
- if (free_s
&& s
)
+ if (free_s)
ASN1_UTCTIME_free(s);
return NULL;
}
ASN1_UTCTIME_free(s);
return NULL;
}