Changeset 248663 in webkit

Timestamp:

Aug 14, 2019 2:27:00 AM (5 years ago)

Author:

youenn@apple.com

Message:

Fail decoding an invalid SessionID
​https://bugs.webkit.org/show_bug.cgi?id=200663

Reviewed by Alex Christensen.

• pal/SessionID.h:

(PAL::SessionID::isValid const):
(PAL::SessionID::isValidSessionIDValue):
(PAL::SessionID::encode const):
Add a release assert to catch bad sessionID senders.
(PAL::SessionID::decode):
Fail decoding if session ID is not a valid value.

Location:

trunk/Source/WebCore/PAL

Files:

• ChangeLog (modified) (1 diff)
• pal/SessionID.h (modified) (5 diffs)

trunk/Source/WebCore/PAL/ChangeLog

@@ +1 @@
+2019-08-14  Youenn Fablet  <youenn@apple.com>
+
+        Fail decoding an invalid SessionID
+        https://bugs.webkit.org/show_bug.cgi?id=200663
+
+        Reviewed by Alex Christensen.
+
+        * pal/SessionID.h:
+        (PAL::SessionID::isValid const):
+        (PAL::SessionID::isValidSessionIDValue):
+        (PAL::SessionID::encode const):
+        Add a release assert to catch bad sessionID senders.
+        (PAL::SessionID::decode):
+        Fail decoding if session ID is not a valid value.
+
 2019-08-09  Tim Horton  <timothy_horton@apple.com>
 

trunk/Source/WebCore/PAL/pal/SessionID.h

@@ -51 +51 @@
     static SessionID legacyPrivateSessionID() { return SessionID(LegacyPrivateSessionID); }
 
-    bool isValid() const { return m_sessionID != HashTableEmptyValueID && m_sessionID != HashTableDeletedValueID; }
+    bool isValid() const { return isValidSessionIDValue(m_sessionID); }
     bool isEphemeral() const { return m_sessionID & EphemeralSessionMask && m_sessionID != HashTableDeletedValueID; }
 
@@ -75 +75 @@
     }
 
+    static bool isValidSessionIDValue(uint64_t sessionID) { return sessionID != HashTableEmptyValueID && sessionID != HashTableDeletedValueID; }
+
     uint64_t m_sessionID;
 };
@@ -81 +83 @@
 void SessionID::encode(Encoder& encoder) const
 {
-    ASSERT(isValid());
+    // FIXME: Change to a regular ASSERT.
+    RELEASE_ASSERT(isValid());
     encoder << m_sessionID;
 }
@@ -93 +96 @@
         return false;
 
-    sessionID = decodedSessionID.value();
+    sessionID = *decodedSessionID;
     return true;
 }
@@ -102 +105 @@
     Optional<uint64_t> sessionID;
     decoder >> sessionID;
-    if (!sessionID)
+    if (!sessionID || !isValidSessionIDValue(*sessionID))
         return WTF::nullopt;
 
-    // FIXME: We should fail to decode an invalid sessionID.
-    ASSERT(SessionID { *sessionID }.isValid());
     return SessionID { *sessionID };
 }