Aren
/
haiku
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix another overflow bug in BMimeType 

* The static toLower() method had the same overflow bug that isValid()
  had. However, since it is a private static method, rather than fix the
  method I replaced with a call to strcasecmp() in the operator== overload.
  When this method was written strcasecmp() must not have been available.

* Declare ch outside of the the loop in IsValid() so that it only gets
  initialized once.
This commit is contained in:
John Scipione 2012-03-14 20:10:14 -04:00
parent 395167071d
commit 4b4e216449
1 changed files with 8 additions and 37 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

45
src/kits/storage/MimeType.cpp
View File

@ -29,7 +29,6 @@ using namespace BPrivate;
// Private helper functions // Private helper functions
static bool isValidMimeChar(const char ch); static bool isValidMimeChar(const char ch);
static status_t toLower(const char *str, char *result);
using namespace BPrivate::Storage::Mime; using namespace BPrivate::Storage::Mime;
using namespace std; using namespace std;
@ -68,26 +67,6 @@ isValidMimeChar(const char ch)
} }
/*!
Returns a lowercase version of str in result. Result must
be preallocated and is assumed to be of adequate length.
*/
static status_t
toLower(const char *str, char *result)
{
if (!str || !result)
return B_BAD_VALUE;
int len = strlen(str);
int i;
for (i = 0; i < len; i++) {
result[i] = tolower(str[i]);
}
result[i] = 0;
return B_OK;
}
// #pragma mark - // #pragma mark -
@ -285,7 +264,7 @@ BMimeType::GetSupertype(BMimeType *superType) const
// == // ==
/*! \brief Returns whether this and the supplied MIME type are equal. /*! \brief Returns whether this and the supplied MIME type are equal.
Two BMimeType objects are said to be equal, if they represent the same Two BMimeType objects are said to be equal if they represent the same
MIME string, ignoring case, or if both are not initialized. MIME string, ignoring case, or if both are not initialized.
\param type The BMimeType to be compared with. \param type The BMimeType to be compared with.
\return \c true, if the objects are equal, \c false otherwise. \return \c true, if the objects are equal, \c false otherwise.
@ -293,21 +272,12 @@ BMimeType::GetSupertype(BMimeType *superType) const
bool bool
BMimeType::operator==(const BMimeType &type) const BMimeType::operator==(const BMimeType &type) const
{ {
char lower1[B_MIME_TYPE_LENGTH]; if (InitCheck() == B_NO_INIT && type.InitCheck() == B_NO_INIT)
char lower2[B_MIME_TYPE_LENGTH];
if (InitCheck() == B_OK && type.InitCheck() == B_OK) {
status_t err = toLower(Type(), lower1);
if (!err)
err = toLower(type.Type(), lower2);
if (!err)
err = (strcmp(lower1, lower2) == 0 ? B_OK : B_ERROR);
return err == B_OK;
} else if (InitCheck() == B_NO_INIT && type.InitCheck() == B_NO_INIT) {
return true; return true;
} else { else if (InitCheck() == B_OK && type.InitCheck() == B_OK)
return false; return strcasecmp(Type(), type.Type()) == 0;
}
return false;
} }
// == // ==
@ -1160,8 +1130,9 @@ BMimeType::IsValid(const char *string)
if (len >= B_MIME_TYPE_LENGTH || len == 0) if (len >= B_MIME_TYPE_LENGTH || len == 0)
return false; return false;
char ch;
for (size_t i = 0; i < len; i++) { for (size_t i = 0; i < len; i++) {
char ch = string[i]; ch = string[i];
if (ch == '/') { if (ch == '/') {
if (foundSlash || i == 0 || i == len - 1) if (foundSlash || i == 0 || i == len - 1)
return false; return false;