Skip to content

fix: five memcpy calls in tinystr in tinystr.cpp #197

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

Open
orbisai0security wants to merge 1 commit into
base: master
Choose a base branch
from
Open

fix: five memcpy calls in tinystr in tinystr.cpp #197

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
44 changes: 39 additions & 5 deletions src/PLASMA/TinyXml/base/tinystr.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,6 +30,7 @@ distribution.
#include <stdlib.h>
#include <string.h>
#include <ctype.h>
#include <limits.h>

#include "tinystr.h"

Expand All @@ -48,7 +49,15 @@ TiXmlString::TiXmlString (const char* instring)
current_length = 0;
return;
}
newlen = strlen (instring) + 1;
size_t slen = strlen (instring);
if (slen >= (size_t)UINT_MAX)
{
allocated = 0;
cstring = NULL;
current_length = 0;
return;
}
newlen = (unsigned)(slen + 1);
newstring = new char [newlen];
memcpy (newstring, instring, newlen);
// strcpy (newstring, instring);
Expand All @@ -74,6 +83,13 @@ TiXmlString::TiXmlString (const TiXmlString& copy)
current_length = 0;
return;
}
if (copy . length () >= UINT_MAX)
{
allocated = 0;
cstring = NULL;
current_length = 0;
return;
}
newlen = copy . length () + 1;
newstring = new char [newlen];
// strcpy (newstring, copy . cstring);
Expand All @@ -94,7 +110,13 @@ void TiXmlString ::operator = (const char * content)
empty_it ();
return;
}
newlen = strlen (content) + 1;
size_t slen = strlen (content);
if (slen >= (size_t)UINT_MAX)
{
empty_it ();
return;
}
newlen = (unsigned)(slen + 1);
newstring = new char [newlen];
// strcpy (newstring, content);
memcpy (newstring, content, newlen);
Expand All @@ -115,6 +137,11 @@ void TiXmlString ::operator = (const TiXmlString & copy)
empty_it ();
return;
}
if (copy . length () >= UINT_MAX)
{
empty_it ();
return;
}
newlen = copy . length () + 1;
newstring = new char [newlen];
// strcpy (newstring, copy . c_str ());
Expand Down Expand Up @@ -142,12 +169,15 @@ void TiXmlString::append( const char* str, int len )
char * new_string;
unsigned new_alloc, new_size, size_suffix;

size_suffix = strlen (str);
size_suffix = (unsigned) strlen (str);
if (len < (int) size_suffix)
size_suffix = len;
size_suffix = (unsigned) len;
if (! size_suffix)
return;

// guard against integer overflow in new_size computation
if (size_suffix > UINT_MAX - length () - 1)
return;
new_size = length () + size_suffix + 1;
// check if we need to expand
if (new_size > allocated)
Expand Down Expand Up @@ -197,7 +227,11 @@ void TiXmlString::append( const char * suffix )
char * new_string;
unsigned new_alloc, new_size;

new_size = length () + strlen (suffix) + 1;
size_t suffix_len = strlen (suffix);
// guard against integer overflow in new_size computation
if (suffix_len >= (size_t)UINT_MAX || suffix_len > (size_t)(UINT_MAX - length () - 1))
return;
new_size = length () + (unsigned)suffix_len + 1;
// check if we need to expand
if (new_size > allocated)
{
Expand Down