Changeset 52201 in vbox

Timestamp:

Jul 25, 2014 8:15:15 PM (11 years ago)

Author:

vboxsync

svn:sync-xref-src-repo-rev:

95261

Message:

Additions/common/VBoxGuestLib: missing return check when retrieving a video mode.

File:

• trunk/src/VBox/Additions/common/VBoxGuestLib/VBoxGuestR3LibVideo.cpp (modified) (1 diff)

trunk/src/VBox/Additions/common/VBoxGuestLib/VBoxGuestR3LibVideo.cpp

@@ -434 +434 @@
  * Now we convert the string returned to numeric values.
  */
-    cMatches = sscanf(szModeParms, "%ux%ux%u,%ux%u,%u\n", &cx, &cy, &cBits, &x,
-                      &y, &fEnabled);
-    if (cMatches == 6)
-        rc = VINF_SUCCESS;
-    else if (cMatches < 0)
-        rc = VERR_READ_ERROR;
-    else
-        rc = VERR_PARSE_ERROR;
+    if (RT_SUCCESS(rc))
+    {
+        cMatches = sscanf(szModeParms, "%ux%ux%u,%ux%u,%u\n", &cx, &cy, &cBits,
+                          &x, &y, &fEnabled);
+        if (cMatches == 6)
+            rc = VINF_SUCCESS;
+        else if (cMatches < 0)
+            rc = VERR_READ_ERROR;
+        else
+            rc = VERR_PARSE_ERROR;
+    }
 /*
  * And clean up and return the values if we successfully obtained them.