diff options
| author | Nick Mathewson <nickm@torproject.org> | 2016-09-11 16:52:24 -0400 |
|---|---|---|
| committer | Nick Mathewson <nickm@torproject.org> | 2016-09-11 16:52:24 -0400 |
| commit | 64521a9d355da9f21d81c8a82056e544372685b2 (patch) | |
| tree | a3ce5b736e41db284f4ae2b5a925ac5195c77acf /src/trunnel/ed25519_cert.c | |
| parent | 77e2be06f6ff9c7328144fe5df3e3bac64106449 (diff) | |
| parent | 25513ae174d80a62ca0a8dcca52683089be95ea3 (diff) | |
| download | tor-64521a9d355da9f21d81c8a82056e544372685b2.tar.gz tor-64521a9d355da9f21d81c8a82056e544372685b2.zip | |
Merge remote-tracking branch 'public/solaris_warnings_028'
Diffstat (limited to 'src/trunnel/ed25519_cert.c')
| -rw-r--r-- | src/trunnel/ed25519_cert.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/trunnel/ed25519_cert.c b/src/trunnel/ed25519_cert.c index f495743667..24988d510b 100644 --- a/src/trunnel/ed25519_cert.c +++ b/src/trunnel/ed25519_cert.c @@ -1,4 +1,4 @@ -/* ed25519_cert.c -- generated by Trunnel v1.4.4. +/* ed25519_cert.c -- generated by Trunnel v1.4.6. * https://gitweb.torproject.org/trunnel.git * You probably shouldn't edit this file. */ @@ -157,7 +157,7 @@ ed25519_cert_extension_setlen_un_unparsed(ed25519_cert_extension_t *inp, size_t &inp->un_unparsed.n_, inp->un_unparsed.elts_, newlen, sizeof(inp->un_unparsed.elts_[0]), (trunnel_free_fn_t) NULL, &inp->trunnel_error_code_); - if (newptr == NULL) + if (newlen != 0 && newptr == NULL) goto trunnel_alloc_failed; inp->un_unparsed.elts_ = newptr; return 0; @@ -589,7 +589,7 @@ ed25519_cert_setlen_ext(ed25519_cert_t *inp, size_t newlen) &inp->ext.n_, inp->ext.elts_, newlen, sizeof(inp->ext.elts_[0]), (trunnel_free_fn_t) ed25519_cert_extension_free, &inp->trunnel_error_code_); - if (newptr == NULL) + if (newlen != 0 && newptr == NULL) goto trunnel_alloc_failed; inp->ext.elts_ = newptr; return 0; |