Changeset 268911 in webkit

Timestamp:

Oct 23, 2020, 1:25:34 AM (6 years ago)

Author:

Carlos Garcia Campos

Message:

Merge r267789 - [GTK] Chassis type check fails if the value is quoted
​https://bugs.webkit.org/show_bug.cgi?id=217123

Patch by Alexander Mikhaylenko <Alexander Mikhaylenko> on 2020-09-30
Reviewed by Carlos Garcia Campos.

Sometimes the chassis type can be quoted, in this case we'll fail to
parse it and fall back to desktop type. Unquote the string before
attempting to parse it.

• wtf/glib/ChassisType.cpp:

(WTF::readMachineInfoChassisType):

Location:

releases/WebKitGTK/webkit-2.30/Source/WTF

Files:

• ChangeLog (modified) (1 diff)
• wtf/glib/ChassisType.cpp (modified) (1 diff)

releases/WebKitGTK/webkit-2.30/Source/WTF/ChangeLog

@@ +1 @@
+2020-09-30  Alexander Mikhaylenko  <alexm@gnome.org>
+
+        [GTK] Chassis type check fails if the value is quoted
+        https://bugs.webkit.org/show_bug.cgi?id=217123
+
+        Reviewed by Carlos Garcia Campos.
+
+        Sometimes the chassis type can be quoted, in this case we'll fail to
+        parse it and fall back to desktop type. Unquote the string before
+        attempting to parse it.
+
+        * wtf/glib/ChassisType.cpp:
+        (WTF::readMachineInfoChassisType):
+
 2020-09-01  Carlos Garcia Campos  <cgarcia@igalia.com>
 

releases/WebKitGTK/webkit-2.30/Source/WTF/wtf/glib/ChassisType.cpp

@@ -47 +47 @@
         if (g_str_has_prefix(split.get()[i], "CHASSIS=")) {
             char* chassis = split.get()[i] + 8;
-            if (!strcmp(chassis, "tablet") || !strcmp(chassis, "handset"))
+
+            GUniquePtr<char> unquoted(g_shell_unquote(chassis, &error.outPtr()));
+            if (error)
+                g_warning("Could not unquote chassis type %s: %s", chassis, error->message);
+
+            if (!strcmp(unquoted.get(), "tablet") || !strcmp(unquoted.get(), "handset"))
                 return ChassisType::Mobile;