Bug 624837 - use calculated string length instead of magic number; r?bagder draft
authorLiang-Heng Chen <xeonchen@gmail.com>
Wed, 14 Jun 2017 18:47:58 +0800
changeset 594005 d3d1f977cf56b84cb6b9609dc10c2e2f53a3594c
parent 593717 b266a8d8fd595b84a7d6218d7b8c6b7af0b5027c
child 633304 e97f85d900bd2e8374dc14cb9dca5fd8e217f44e
push id63904
push userbmo:xeonchen@mozilla.com
push dateWed, 14 Jun 2017 11:25:15 +0000
reviewersbagder
bugs624837
milestone56.0a1
Bug 624837 - use calculated string length instead of magic number; r?bagder The original magic number is incorrect. MozReview-Commit-ID: LtdnINTONHq
toolkit/system/windowsproxy/nsWindowsSystemProxySettings.cpp
--- a/toolkit/system/windowsproxy/nsWindowsSystemProxySettings.cpp
+++ b/toolkit/system/windowsproxy/nsWindowsSystemProxySettings.cpp
@@ -213,16 +213,17 @@ nsWindowsSystemProxySettings::GetProxyFo
 
     if (MatchOverride(aHost)) {
         SetProxyResultDirect(aResult);
         return NS_OK;
     }
 
     NS_ConvertUTF16toUTF8 cbuf(buf);
 
+    NS_NAMED_LITERAL_CSTRING(kSocksPrefix, "socks=");
     nsAutoCString prefix;
     ToLowerCase(aScheme, prefix);
 
     prefix.Append('=');
 
     nsAutoCString specificProxy;
     nsAutoCString defaultProxy;
     nsAutoCString socksProxy;
@@ -244,19 +245,19 @@ nsWindowsSystemProxySettings::GetProxyFo
                 // (http://msdn.microsoft.com/en-us/library/aa383996%28VS.85%29.aspx)
                 defaultProxy = proxy;
             } else if (proxy.Find(prefix) == 0) {
                 // To list a proxy for a specific protocol, the string must
                 // follow the format "<protocol>=<protocol>://<proxy_name>".
                 // (http://msdn.microsoft.com/en-us/library/aa383996%28VS.85%29.aspx)
                 specificProxy = Substring(proxy, prefix.Length());
                 break;
-            } else if (proxy.Find("socks=") == 0) {
+            } else if (proxy.Find(kSocksPrefix) == 0) {
                 // SOCKS proxy.
-                socksProxy = Substring(proxy, 5); // "socks=" length.
+                socksProxy = Substring(proxy, kSocksPrefix.Length()); // "socks=" length.
             }
         }
 
         if (delimiter == end)
             break;
         start = ++delimiter;
     }