diff options
| author | Qiuhao Li <Qiuhao.Li@outlook.com> | 2022-11-29 16:28:27 +0800 |
|---|---|---|
| committer | Qiuhao Li <Qiuhao.Li@outlook.com> | 2022-11-29 16:28:27 +0800 |
| commit | ae74d275cfc3219f3cacb8bd2dec303d0ae9848e (patch) | |
| tree | 57e34b353783944a906fc83b5b2d95bdb4b32369 | |
| parent | 6a8b4cfc2c9a8a770346f8777ca9da8130b2171d (diff) | |
| download | libmtp-ae74d275cfc3219f3cacb8bd2dec303d0ae9848e.tar.gz | |
ptp-pack: fix ucs2str overflow
https://github.com/libmtp/libmtp/pull/134
https://github.com/libmtp/libmtp/commit/2ada8d587bbfb077f3b7155ebd0dfa8db65e935d#r91371167
Signed-off-by: Qiuhao Li <Qiuhao.Li@outlook.com>
| -rw-r--r-- | src/ptp-pack.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/src/ptp-pack.c b/src/ptp-pack.c index 0616996..381326f 100644 --- a/src/ptp-pack.c +++ b/src/ptp-pack.c @@ -229,7 +229,9 @@ ptp_pack_string(PTPParams *params, char *string, unsigned char* data, uint16_t o #endif { unsigned int i; - + if (convlen > PTP_MAXSTRLEN) { + convlen = PTP_MAXSTRLEN; + } for (i=0;i<convlen;i++) { ucs2str[i] = string[i]; } |