Skip to content

L
liblongpath-rsync
Commit 73253721 authored by Wayne Davison's avatar Wayne Davison
Browse files
Options

Cast char* to uchar* when dereferencing characters for isdigit() 

and isprint().
parent 4adbb5f2
Show whitespace changes
Inline Side-by-side
Showing with 3 additions and 3 deletions
util.c
View file @ 73253721
...@@ -891,7 +891,7 @@ const char *safe_fname(const char *fname) ...@@ -891,7 +891,7 @@ const char *safe_fname(const char *fname)
ndx = (ndx + 1) % MAX_SAFE_NAMES; ndx = (ndx + 1) % MAX_SAFE_NAMES;
for (t = fbuf[ndx]; *fname; fname++) { for (t = fbuf[ndx]; *fname; fname++) {
if (!isprint(*fname)) if (!isprint(*(uchar*)fname))
*t++ = '?'; *t++ = '?';
else else
*t++ = *fname; *t++ = *fname;
...@@ -1262,7 +1262,7 @@ const char *find_filename_suffix(const char *fn, int fn_len, int *len_ptr) ...@@ -1262,7 +1262,7 @@ const char *find_filename_suffix(const char *fn, int fn_len, int *len_ptr)
if (strcmp(s+1, "orig") == 0) if (strcmp(s+1, "orig") == 0)
continue; continue;
} else if (s_len > 2 && had_tilde } else if (s_len > 2 && had_tilde
&& s[1] == '~' && isdigit(s[2])) && s[1] == '~' && isdigit(*(uchar*)(s+2)))
continue; continue;
*len_ptr = s_len; *len_ptr = s_len;
suf = s; suf = s;
...@@ -1270,7 +1270,7 @@ const char *find_filename_suffix(const char *fn, int fn_len, int *len_ptr) ...@@ -1270,7 +1270,7 @@ const char *find_filename_suffix(const char *fn, int fn_len, int *len_ptr)
break; break;
/* Determine if the suffix is all digits. */ /* Determine if the suffix is all digits. */
for (s++, s_len--; s_len > 0; s++, s_len--) { for (s++, s_len--; s_len > 0; s++, s_len--) {
if (!isdigit(*s)) if (!isdigit(*(uchar*)s))
return suf; return suf;
} }
/* An all-digit suffix may not be that signficant. */ /* An all-digit suffix may not be that signficant. */
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment