diff options
| author | Marcus Meissner <marcus@jet.franken.de> | 2022-11-22 09:10:43 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-11-22 09:10:43 +0100 |
| commit | 2ada8d587bbfb077f3b7155ebd0dfa8db65e935d (patch) | |
| tree | 5ba4febe5f093ef4554efd621080b64d09febd8b | |
| parent | fed623576b5f2c78f470c1c5f6d94c8ed754be31 (diff) | |
| parent | 45b29802d7473a969cbc268a4c64e0797c7911c2 (diff) | |
| download | libmtp-2ada8d587bbfb077f3b7155ebd0dfa8db65e935d.tar.gz | |
Merge pull request #134 from QiuhaoLi/protect_ucs2str_for_no_iconv
ptp_pack_string: check string length for no iconv situation
| -rw-r--r-- | src/ptp-pack.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/ptp-pack.c b/src/ptp-pack.c index 0616996..d5e9488 100644 --- a/src/ptp-pack.c +++ b/src/ptp-pack.c @@ -212,13 +212,13 @@ ptp_pack_string(PTPParams *params, char *string, unsigned char* data, uint16_t o uint16_t ucs2str[PTP_MAXSTRLEN+1]; char *ucs2strp = (char *) ucs2str; size_t convlen = strlen(string); + size_t convmax = PTP_MAXSTRLEN * 2; /* Includes the terminator */ /* Cannot exceed 255 (PTP_MAXSTRLEN) since it is a single byte, duh ... */ memset(ucs2strp, 0, sizeof(ucs2str)); /* XXX: necessary? */ #if defined(HAVE_ICONV) && defined(HAVE_LANGINFO_H) if (params->cd_locale_to_ucs2 != (iconv_t)-1) { size_t nconv; - size_t convmax = PTP_MAXSTRLEN * 2; /* Includes the terminator */ char *stringp = string; nconv = iconv(params->cd_locale_to_ucs2, &stringp, &convlen, @@ -230,10 +230,10 @@ ptp_pack_string(PTPParams *params, char *string, unsigned char* data, uint16_t o { unsigned int i; - for (i=0;i<convlen;i++) { + for (i=0;i<convlen && i<convmax;i++) { ucs2str[i] = string[i]; } - ucs2str[convlen] = 0; + ucs2str[i] = 0; } /* * XXX: isn't packedlen just ( (uint16_t *)ucs2strp - ucs2str )? |