replace memcmp with MagicCmp that supports '.' for single character of anythi...

net/base/mime_sniffer.cc

Index: net/base/mime_sniffer.cc
===================================================================
--- net/base/mime_sniffer.cc	(revision 70720)
+++ net/base/mime_sniffer.cc	(working copy)
@@ -1,4 +1,4 @@
-// Copyright (c) 2010 The Chromium Authors. All rights reserved.
+// Copyright (c) 2011 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
@@ -146,6 +146,8 @@
   MAGIC_NUMBER("image/tiff", "II*")
   MAGIC_NUMBER("image/tiff", "MM\x00*")
   MAGIC_NUMBER("audio/mpeg", "ID3")
+  MAGIC_NUMBER("image/webp", "RIFF....WEBPVP8 ")
+  MAGIC_NUMBER("video/webm", "\x1A\x45\xDF\xA3")
   // TODO(abarth): we don't handle partial byte matches yet
   // MAGIC_NUMBER("video/mpeg", "\x00\x00\x01\xB")
   // MAGIC_NUMBER("audio/mpeg", "\xFF\xE")
@@ -215,6 +217,21 @@
   return counter;
 }
 
+static bool MagicCmp(const char* magic_entry, const char* content, size_t len) {
+  bool same = true;
+  while (len && same) {
+    if (!*content && !magic_entry)
+      break;

[abarth-chromium, 2011/01/11 19:50:46]

We don't want to start at null bytes, right?  Also, how could magic_entry be
null?

[fbarchard1, 2011/01/11 20:01:47]

This was a typo... fixed.

+    same = (*magic_entry == *content) || (*magic_entry == '.' && *content);

[abarth-chromium, 2011/01/11 19:50:46]

So "." matches everything that's not zero?  Why wouldn't it match zero?

[fbarchard1, 2011/01/11 20:01:47]

Good point.  I was thinking strings, but this is a memcmp.

+    if (!*content || !magic_entry)
+      break;
+    ++magic_entry;
+    ++content;
+    --len;
+  }
+  return same;

[abarth-chromium, 2011/01/11 19:50:46]

We should just early return from the loop rather than have this extra bool.

[fbarchard1, 2011/01/11 20:01:47]

ok, will refactor.

+}
+
 static bool MatchMagicNumber(const char* content, size_t size,
                              const MagicNumber* magic_entry,
                              std::string* result) {
@@ -239,7 +256,7 @@
     }
   } else {
     if (size >= len)
-      match = (memcmp(magic_entry->magic, content, len) == 0);
+      match = MagicCmp(magic_entry->magic, content, len);
   }
 
   if (match) {
@@ -251,7 +268,8 @@
 
 static bool CheckForMagicNumbers(const char* content, size_t size,
                                  const MagicNumber* magic, size_t magic_len,
-                                 base::Histogram* counter, std::string* result) {
+                                 base::Histogram* counter,
+                                 std::string* result) {
   for (size_t i = 0; i < magic_len; ++i) {
     if (MatchMagicNumber(content, size, &(magic[i]), result)) {
       if (counter) counter->Add(static_cast<int>(i));