patches/07_fix_strcpy_in_ptp_unpack_ptptime.patch - Issue 2345493002: Uprev libmtp to 1.1.12

Side by Side Diff

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Side by Side Diff: patches/07_fix_strcpy_in_ptp_unpack_ptptime.patch

Issue 2345493002: Uprev libmtp to 1.1.12 (Closed) Base URL: https://chromium.googlesource.com/chromium/deps/libmtp@master

Patch Set: Re-upload cl Created 4 years, 2 months ago

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Jump to:

OLD	NEW
	(Empty)
1 Index: src/ptp-pack.c

2 ===================================================================

3 --- src/ptp-pack.c (revision 148712)

4 +++ src/ptp-pack.c (working copy)

5 @@ -533,7 +533,7 @@

6 ptp_unpack_PTPTIME (const char *str) {

7 char ptpdate[40];

8 char tmp[5];

9 - int ptpdatelen;

10 + size_t ptpdatelen;

11 struct tm tm;

12

13 if (!str)

14 @@ -543,11 +543,12 @@

15 /ptp_debug (params ,"datelen is larger then size of buffer", pt pdatelen, (int)sizeof(ptpdate));/

16 return 0;

17 }

18 - strcpy (ptpdate, str);

19 if (ptpdatelen<15) {

20 /ptp_debug (params ,"datelen is less than 15 (%d)", ptpdatelen) ;/

21 return 0;

22 }

23 + strncpy (ptpdate, str, sizeof(ptpdate));

24 + ptpdate[sizeof(ptpdate) - 1] = '\0';

25

26 memset(&tm,0,sizeof(tm));

27 strncpy (tmp, ptpdate, 4);

OLD	NEW