Merge 131658 - IndexedDB: Enforce unsigned long/unsigned long long ranges

Source/WebCore/Modules/indexeddb/IDBFactory.cpp

 /*
  * Copyright (C) 2010 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 90 matching lines @@
     if (!isContextValid(context))
         return 0;
 
     RefPtr<IDBRequest> request = IDBRequest::create(context, IDBAny::create(this), 0);
     m_backend->getDatabaseNames(request, context->securityOrigin(), context, getIndexedDBDatabasePath(context));
     return request;
 }
 
 PassRefPtr<IDBOpenDBRequest> IDBFactory::open(ScriptExecutionContext* context, const String& name, int64_t version, ExceptionCode& ec)
 {
+    // FIXME: This should only need to check for 0 once webkit.org/b/96798 lands.
+    const int64_t maxECMAScriptInteger = 0x20000000000000LL - 1;
+    if (version < 1 || version > maxECMAScriptInteger) {
+        ec = NATIVE_TYPE_ERR;
+        return 0;
+    }
+    return openInternal(context, name, version, ec);
+}
+
+PassRefPtr<IDBOpenDBRequest> IDBFactory::openInternal(ScriptExecutionContext* context, const String& name, int64_t version, ExceptionCode& ec)
+{
+    ASSERT(version >= 1 || version == IDBDatabaseMetadata::NoIntVersion);
     if (name.isNull()) {
         ec = NATIVE_TYPE_ERR;
         return 0;
     }
-    // FIXME: We need to throw an error if script passes -1. Somehow refactor
-    // this to avoid wanting to throw an error with the sentinel.
-    if (!version || version < IDBDatabaseMetadata::NoIntVersion) {
-        ec = NATIVE_TYPE_ERR;
-        return 0;
-    }
     if (!isContextValid(context))
         return 0;
 
     RefPtr<IDBDatabaseCallbacksImpl> databaseCallbacks = IDBDatabaseCallbacksImpl::create();
     RefPtr<IDBOpenDBRequest> request = IDBOpenDBRequest::create(context, IDBAny::createNull(), databaseCallbacks, version);
     m_backend->open(name, version, request, databaseCallbacks, context->securityOrigin(), context, getIndexedDBDatabasePath(context));
     return request;
 }
 
 PassRefPtr<IDBOpenDBRequest> IDBFactory::open(ScriptExecutionContext* context, const String& name, ExceptionCode& ec)
 {
-    return open(context, name, IDBDatabaseMetadata::NoIntVersion, ec);
+    return openInternal(context, name, IDBDatabaseMetadata::NoIntVersion, ec);
 }
 
 PassRefPtr<IDBVersionChangeRequest> IDBFactory::deleteDatabase(ScriptExecutionContext* context, const String& name, ExceptionCode& ec)
 {
     if (name.isNull()) {
         ec = NATIVE_TYPE_ERR;
         return 0;
     }
     if (!isContextValid(context))
         return 0;
@@ skipping 12 matching lines @@
         ec = IDBDatabaseException::DATA_ERR;
         return 0;
     }
 
     return static_cast<short>(first->compare(second.get()));
 }
 
 } // namespace WebCore
 
 #endif // ENABLE(INDEXED_DATABASE)