Merge 120617

Source/WebCore/page/ContentSecurityPolicy.cpp

 /*
  * Copyright (C) 2011 Google, Inc. All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
  * 2. Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in the
@@ skipping 296 matching lines @@
     const UChar* beginPort = 0;
 
     skipWhile<isNotColonOrSlash>(position, end);
 
     if (position == end) {
         // host
         //     ^
         return parseHost(beginHost, position, host, hostHasWildcard);
     }
 
-    if (*position == '/') {
+    if (position < end && *position == '/') {
         // host/path || host/ || /
         //     ^            ^    ^
         if (!parseHost(beginHost, position, host, hostHasWildcard)
             || !parsePath(position, end, path)
             || position != end)
             return false;
         return true;
     }
 
-    if (*position == ':') {
+    if (position < end && *position == ':') {
         if (end - position == 1) {
             // scheme:
             //       ^
             return parseScheme(begin, position, scheme);
         }
 
         if (position[1] == '/') {
             // scheme://host || scheme://
             //       ^                ^
             if (!parseScheme(begin, position, scheme)
                 || !skipExactly(position, end, ':')
                 || !skipExactly(position, end, '/')
                 || !skipExactly(position, end, '/'))
                 return false;
             if (position == end)
                 return true;
             beginHost = position;
             skipWhile<isNotColonOrSlash>(position, end);
         }
 
-        if (*position == ':') {
+        if (position < end && *position == ':') {
             // host:port || scheme://host:port
             //     ^                     ^
             beginPort = position;
             skipUntil(position, end, '/');
         }
     }
-    
-    if (*position == '/') {
+
+    if (position < end && *position == '/') {
         // scheme://host/path || scheme://host:port/path
         //              ^                          ^
         if (position == beginHost)
             return false;
 
         beginPath = position;
     }
 
     if (!parseHost(beginHost, beginPort ? beginPort : beginPath, host, hostHasWildcard))
         return false;
@@ skipping 719 matching lines @@
 {
     return isAllowedByAllWithURL<&CSPDirectiveList::allowMediaFromSource>(m_policies, url);
 }
 
 bool ContentSecurityPolicy::allowConnectToSource(const KURL& url) const
 {
     return isAllowedByAllWithURL<&CSPDirectiveList::allowConnectToSource>(m_policies, url);
 }
 
 }