Bug 1485342 - Avoid isdigit() and isxdigit() in URL classifier. r=francois

MozReview-Commit-ID: IvadP10PFEZ

Differential Revision: https://phabricator.services.mozilla.com/D4312

--HG--
extra : moz-landing-system : lando
This commit is contained in:
Henri Sivonen 2018-08-27 15:55:13 +00:00
parent 49299af1f0
commit e262584728

View File

@ -19,6 +19,7 @@
#include "nsIHttpChannelInternal.h"
#include "mozIThirdPartyUtil.h"
#include "nsIDocShell.h"
#include "mozilla/TextUtils.h"
#define DEFAULT_PROTOCOL_VERSION "2.2"
@ -32,7 +33,7 @@ static bool
IsDecimal(const nsACString & num)
{
for (uint32_t i = 0; i < num.Length(); i++) {
if (!isdigit(num[i])) {
if (!mozilla::IsAsciiDigit(num[i])) {
return false;
}
}
@ -52,7 +53,7 @@ IsHex(const nsACString & num)
}
for (uint32_t i = 2; i < num.Length(); i++) {
if (!isxdigit(num[i])) {
if (!mozilla::IsAsciiHexDigit(num[i])) {
return false;
}
}
@ -72,7 +73,7 @@ IsOctal(const nsACString & num)
}
for (uint32_t i = 1; i < num.Length(); i++) {
if (!isdigit(num[i]) || num[i] == '8' || num[i] == '9') {
if (!mozilla::IsAsciiDigit(num[i]) || num[i] == '8' || num[i] == '9') {
return false;
}
}
@ -947,7 +948,7 @@ nsUrlClassifierUtils::ParseIPAddress(const nsACString & host,
}
for (host.BeginReading(iter); iter != end; iter++) {
if (!(isxdigit(*iter) || *iter == 'x' || *iter == 'X' || *iter == '.')) {
if (!(mozilla::IsAsciiHexDigit(*iter) || *iter == 'x' || *iter == 'X' || *iter == '.')) {
// not an IP
return;
}