From ae74d275cfc3219f3cacb8bd2dec303d0ae9848e Mon Sep 17 00:00:00 2001
From: Qiuhao Li <Qiuhao.Li@outlook.com>
Date: Tue, 29 Nov 2022 16:28:27 +0800
Subject: 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>
---
 src/ptp-pack.c | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

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];
 		}
-- 
cgit v1.2.1