i2p/haiku-beta6
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

* Fix a bug where a string longer than INT_MAX can cause IsValid() to falsely

Browse Source 
report a valid mimetype because strlen() returns a result than when stored
  in an int is treated as a negative number.

* Style fixes in the same method
This commit is contained in:
John Scipione
2012-03-14 18:56:54 -04:00
parent 08de244f9c
commit 395167071d
1 changed files with 8 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/kits/storage/MimeType.cpp
+3 -3
View File
@@ -1152,15 +1152,15 @@ BMimeType::GetWildcardApps(BMessage *wild_ones)
bool bool
BMimeType::IsValid(const char *string) BMimeType::IsValid(const char *string)
{ {
if (!string) if (string == NULL)
return false; return false;
bool foundSlash = false; bool foundSlash = false;
int len = strlen(string); size_t len = strlen(string);
if (len >= B_MIME_TYPE_LENGTH || len == 0) if (len >= B_MIME_TYPE_LENGTH || len == 0)
return false; return false;
for (int i = 0; i < len; i++) { for (size_t i = 0; i < len; i++) {
char ch = string[i]; char ch = string[i];
if (ch == '/') { if (ch == '/') {
if (foundSlash || i == 0 || i == len - 1) if (foundSlash || i == 0 || i == len - 1)