Skip to content

xrTrims.cpp: Fix _CopyVal to actually be safe #6

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
themrdemonized merged 1 commit into from
Aug 12, 2023
Merged

xrTrims.cpp: Fix _CopyVal to actually be safe #6

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
xrTrims.cpp: Fix _CopyVal to actually be safe 
* _CopyVal: Called by _GetItem (which explicitly takes a dst_size
  argument), this function will stomp dst if the tokenized string
  is longer than the size of dst. Fix this by actually using a
  dst_size argument (which the caller already has) and clamping the
  strncpy to it.
  • Loading branch information
@clayne
clayne committed Aug 12, 2023
commit 3ba3470e56318d59dfa0585486734ec8c217067a
6 changes: 3 additions & 3 deletions src/xrCore/xr_trims.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,13 +40,13 @@ LPCSTR _SetPos(LPCSTR src, u32 pos, char separator)
return res;
}

LPCSTR _CopyVal(LPCSTR src, LPSTR dst, char separator)
LPCSTR _CopyVal(LPCSTR src, LPSTR dst, u32 const dst_size, char separator)
{
LPCSTR p;
size_t n;
p = strchr(src, separator);
n = (p > 0) ? (p - src) : xr_strlen(src);
strncpy(dst, src, n);
strncpy(dst, src, _min(dst_size, (u32)n));
dst[n] = 0;
return dst;
}
Expand Down Expand Up @@ -74,7 +74,7 @@ LPSTR _GetItem(LPCSTR src, int index, LPSTR dst, u32 const dst_size, char separa
{
LPCSTR ptr;
ptr = _SetPos(src, index, separator);
if (ptr) _CopyVal(ptr, dst, separator);
if (ptr) _CopyVal(ptr, dst, dst_size, separator);
else xr_strcpy(dst, dst_size, def);
if (trim) _Trim(dst);
return dst;
Expand Down
2 changes: 1 addition & 1 deletion src/xrCore/xr_trims.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ inline LPSTR _GetItem(LPCSTR src, int index, char (&dst)[count], char separator

XRCORE_API LPSTR _GetItems(LPCSTR, int, int, LPSTR, char separator = ',');
XRCORE_API LPCSTR _SetPos(LPCSTR src, u32 pos, char separator = ',');
XRCORE_API LPCSTR _CopyVal(LPCSTR src, LPSTR dst, char separator = ',');
XRCORE_API LPCSTR _CopyVal(LPCSTR src, LPSTR dst, u32 const dst_size, char separator = ',');
XRCORE_API LPSTR _Trim(LPSTR str);
XRCORE_API LPSTR _TrimLeft(LPSTR str);
XRCORE_API LPSTR _TrimRight(LPSTR str);
Expand Down