Commit aac0fce6 authored by Byron Campen's avatar Byron Campen Committed by Pier Angelo Vendrame
Browse files

Bug 2021768: Use unsigned char for these. a=diannaS 

Original Revision: https://phabricator.services.mozilla.com/D287613

Differential Revision: https://phabricator.services.mozilla.com/D289861
parent 3da36b47

dom/media/webrtc/jsapi/RTCDTMFSender.cpp

+3 −3
Original line number Diff line number Diff line
@@ -52,13 +52,13 @@ static int GetDTMFToneCode(uint16_t c) { 


static std::bitset<256> GetCharacterBitset(const std::string& aCharsInSet) {

  std::bitset<256> result;

  for (auto c : aCharsInSet) {

  for (unsigned char c : aCharsInSet) {

    result[c] = true;

  }

  return result;

}



static bool IsUnrecognizedChar(const char c) {

static bool IsUnrecognizedChar(const unsigned char c) {

  static const std::bitset<256> recognized =

      GetCharacterBitset("0123456789ABCD#*,");

  return !recognized[c];
@@ -85,7 +85,7 @@ void RTCDTMFSender::InsertDTMF(const nsAString& aTones, uint32_t aDuration, 
  std::string utf8Tones = NS_ConvertUTF16toUTF8(aTones).get();



  std::transform(utf8Tones.begin(), utf8Tones.end(), utf8Tones.begin(),

                 [](const char c) { return std::toupper(c); });

                 [](const unsigned char c) { return std::toupper(c); });



  if (std::any_of(utf8Tones.begin(), utf8Tones.end(), IsUnrecognizedChar)) {

    aRv.Throw(NS_ERROR_DOM_INVALID_CHARACTER_ERR);