From 995224e277f401d0efc9824cefe751e99cb1dfa3 Mon Sep 17 00:00:00 2001 From: Marcus Meissner Date: Thu, 14 Feb 2013 19:56:29 +0000 Subject: [PATCH] merged a strcpy->strncpy patch from Chrome OS libmtp From: Lei Zhang Subject: [PATCH 05/10] Fix strcpy() in ptp_unpack_PTPTIME(). git-svn-id: https://svn.code.sf.net/p/gphoto/code/trunk/libgphoto2@14232 67ed7778-7388-44ab-90cf-0a291f65f57c --- camlibs/ptp2/ptp-pack.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/camlibs/ptp2/ptp-pack.c b/camlibs/ptp2/ptp-pack.c index 716e8cbc9..a06703c7d 100644 --- a/camlibs/ptp2/ptp-pack.c +++ b/camlibs/ptp2/ptp-pack.c @@ -533,7 +533,7 @@ static time_t ptp_unpack_PTPTIME (const char *str) { char ptpdate[40]; char tmp[5]; - int ptpdatelen; + size_t ptpdatelen; struct tm tm; if (!str) @@ -543,11 +543,12 @@ ptp_unpack_PTPTIME (const char *str) { /*ptp_debug (params ,"datelen is larger then size of buffer", ptpdatelen, (int)sizeof(ptpdate));*/ return 0; } - strcpy (ptpdate, str); if (ptpdatelen<15) { /*ptp_debug (params ,"datelen is less than 15 (%d)", ptpdatelen);*/ return 0; } + strncpy (ptpdate, str, sizeof(ptpdate)); + ptpdate[sizeof(ptpdate) - 1] = '\0'; memset(&tm,0,sizeof(tm)); strncpy (tmp, ptpdate, 4);