From c3e838cecfd22c8f0e9928efbf695279d9ea610d Mon Sep 17 00:00:00 2001 From: Syping Date: Tue, 6 Jun 2023 20:27:51 +0200 Subject: [PATCH] RagePhoto.c: fix iconv code --- src/RagePhoto.c | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/src/RagePhoto.c b/src/RagePhoto.c index f71e942..9244975 100644 --- a/src/RagePhoto.c +++ b/src/RagePhoto.c @@ -684,10 +684,11 @@ bool ragephotodata_savef(RagePhotoData *rp_data, RagePhotoFormatParser *rp_parse #if defined(UNICODE_ICONV) iconv_t iconv_in = iconv_open("UTF-16LE", "UTF-8"); if (iconv_in == (iconv_t)-1) { - rp_data->error = Error::UnicodeInitError; // 4 + rp_data->error = RAGEPHOTO_ERROR_UNICODEINITERROR; // 4 return false; } - char photoHeader[256]{}; + char photoHeader[256]; + memset(&photoHeader, 0, 256); size_t src_s = strlen(rp_data->header); size_t dst_s = sizeof(photoHeader); char *src = rp_data->header; @@ -695,7 +696,7 @@ bool ragephotodata_savef(RagePhotoData *rp_data, RagePhotoFormatParser *rp_parse const size_t ret = iconv(iconv_in, &src, &src_s, &dst, &dst_s); iconv_close(iconv_in); if (ret == (size_t)(-1)) { - rp_data->error = Error::UnicodeHeaderError; // 6 + rp_data->error = RAGEPHOTO_ERROR_UNICODEHEADERERROR; // 6 return false; } const size_t photoHeader_size = 256;