diff options
Diffstat (limited to 'src/Common/libzip/zip_memdup.c')
| -rw-r--r-- | src/Common/libzip/zip_memdup.c | 17 |
1 files changed, 8 insertions, 9 deletions
diff --git a/src/Common/libzip/zip_memdup.c b/src/Common/libzip/zip_memdup.c index cc6d767d..75d72c61 100644 --- a/src/Common/libzip/zip_memdup.c +++ b/src/Common/libzip/zip_memdup.c @@ -1,10 +1,10 @@ /* zip_memdup.c -- internal zip function, "strdup" with len - Copyright (C) 1999-2014 Dieter Baron and Thomas Klausner + Copyright (C) 1999-2021 Dieter Baron and Thomas Klausner This file is part of libzip, a library to manipulate ZIP archives. - The authors can be contacted at <libzip@nih.at> + The authors can be contacted at <info@libzip.org> Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions are met: @@ -16,9 +16,9 @@ distribution. 3. The names of the authors may not be used to endorse or promote products derived from this software without specific prior written permission. - + THIS SOFTWARE IS PROVIDED BY THE AUTHORS ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHORS BE LIABLE FOR ANY @@ -37,21 +37,20 @@ #include "zipint.h" void * -_zip_memdup(const void *mem, size_t len, zip_error_t *error) -{ +_zip_memdup(const void *mem, size_t len, zip_error_t *error) { void *ret; if (len == 0) - return NULL; + return NULL; ret = malloc(len); if (!ret) { - zip_error_set(error, ZIP_ER_MEMORY, 0); - return NULL; + zip_error_set(error, ZIP_ER_MEMORY, 0); + return NULL; } - memcpy(ret, mem, len); + (void)memcpy_s(ret, len, mem, len); return ret; } |