Changeset 62165 in vbox for trunk/src/VBox/GuestHost

Timestamp:

Jul 11, 2016 4:24:07 PM (9 years ago)

Author:

vboxsync

Message:

SharedOpenGL/spuload: don't continue if loading the super SPU failed, see bugref:8485

File:

• trunk/src/VBox/GuestHost/OpenGL/spu_loader/spuload.c (modified) (4 diffs)

trunk/src/VBox/GuestHost/OpenGL/spu_loader/spuload.c

@@ -109 +109 @@
         }
 
+        bool fNeedSuperSPU = false;
         /* This basically calls the SPU's SPULoad() function */
         if (!the_spu->entry_point( &(the_spu->name), &(the_spu->super_name),
@@ -129 +130 @@
                 }
                 the_spu->superSPU = crSPULoad( child, id, the_spu->super_name, dir, server );
+                fNeedSuperSPU = true;
         }
 #else
@@ -139 +141 @@
                 }
                 the_spu->superSPU = crSPULoad( child, id, the_spu->super_name, dir, server );
+                fNeedSuperSPU = true;
         }
 #endif
@@ -144 +147 @@
         {
                 the_spu->superSPU = NULL;
+        }
+        if (fNeedSuperSPU && !the_spu->superSPU)
+        {
+                crError( "Unable to load super SPU \"%s\" of \"%s\"!", the_spu->super_name, name );
+                crSPUUnloadChain(the_spu);
+                return NULL;
         }
         crDebug("Initializing %s SPU", name);