Merge 86665

Source/WebCore/storage/IDBObjectStoreBackendImpl.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
@@ skipping 323 matching lines @@
         , m_objectStoreId(objectStoreId)
         , m_indexId(indexId)
     {
     }
 
     virtual bool callback(const IDBBackingStore::ObjectStoreRecordIdentifier* recordIdentifier, const String& value)
     {
         RefPtr<SerializedScriptValue> objectValue = SerializedScriptValue::createFromWire(value);
         RefPtr<IDBKey> indexKey = fetchKeyFromKeyPath(objectValue.get(), m_indexKeyPath);
 
+        if (!indexKey)
+            return true;
         if (!m_backingStore.putIndexDataForRecord(m_databaseId, m_objectStoreId, m_indexId, *indexKey, recordIdentifier))
             return false;
 
         return true;
     }
 
 private:
     IDBBackingStore& m_backingStore;
     const String& m_indexKeyPath;
     int64_t m_databaseId;
@@ skipping 152 matching lines @@
         return IDBKey::createNumber(m_autoIncrementNumber++);
 
     m_autoIncrementNumber = static_cast<int>(m_backingStore->nextAutoIncrementNumber(m_databaseId, id()));
     return IDBKey::createNumber(m_autoIncrementNumber++);
 }
 
 
 } // namespace WebCore
 
 #endif