Changeset 31003 in vbox

Timestamp:

Jul 22, 2010 2:53:11 PM (15 years ago)

Author:

vboxsync

Message:

2d: bugfix

File:

• trunk/src/VBox/Frontends/VirtualBox/src/VBoxFBOverlay.cpp (modified) (5 diffs)

trunk/src/VBox/Frontends/VirtualBox/src/VBoxFBOverlay.cpp

@@ -470 +470 @@
 int VBoxVHWAGlShader::init()
 {
-    int rc;
+    int rc = VERR_GENERAL_FAILURE;
     GLint *length;
     const char **sources;
@@ -481 +481 @@
         AssertRC(rc);
         if(RT_FAILURE(rc))
-            return rc;
+            goto exit;
         sources[i] = maComponents[i]->contents();
     }
@@ -512 +512 @@
     vboxglGetShaderInfoLog(mShader, 16300, NULL, pBuf);
     VBOXQGLLOG(("\ncompile log:\n-----------\n%s\n---------\n", pBuf));
-    delete pBuf;
+    delete[] pBuf;
 #endif
 
@@ -518 +518 @@
     if(compiled)
     {
-        return VINF_SUCCESS;
+        rc = VINF_SUCCESS;
+        goto exit;
     }
 
@@ -527 +528 @@
     mShader = 0;
 
+exit:
     delete[] length;
     delete[] sources;
-    return VERR_GENERAL_FAILURE;
+    return rc;
 }