diff options
author | Kenny Root <kroot@google.com> | 2015-11-06 23:09:15 +0000 |
---|---|---|
committer | android-build-merger <android-build-merger@google.com> | 2015-11-06 23:09:15 +0000 |
commit | 30217ab4bfb9ab256cf52e478c39af1b50e178db (patch) | |
tree | 24150183cfed2ad79eb2258cf525b4fc4544bd2d /src/crypto/buf/buf.c | |
parent | 80043196325becce95d8fae59b7a8eb498839f40 (diff) | |
parent | 9659931bf7d197c3ab757604b3ca730aeac2129f (diff) | |
download | external_boringssl-30217ab4bfb9ab256cf52e478c39af1b50e178db.zip external_boringssl-30217ab4bfb9ab256cf52e478c39af1b50e178db.tar.gz external_boringssl-30217ab4bfb9ab256cf52e478c39af1b50e178db.tar.bz2 |
Merge "Revert "external/boringssl: sync with upstream.""
am: 9659931bf7
* commit '9659931bf7d197c3ab757604b3ca730aeac2129f':
Revert "external/boringssl: sync with upstream."
Diffstat (limited to 'src/crypto/buf/buf.c')
-rw-r--r-- | src/crypto/buf/buf.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/crypto/buf/buf.c b/src/crypto/buf/buf.c index b918f01..13b5ceb 100644 --- a/src/crypto/buf/buf.c +++ b/src/crypto/buf/buf.c @@ -220,7 +220,7 @@ size_t BUF_strlcat(char *dst, const char *src, size_t dst_size) { void *BUF_memdup(const void *data, size_t dst_size) { void *ret; - if (dst_size == 0) { + if (data == NULL) { return NULL; } |