Fixed broken libretro frontend

andreas-jonsson · Nov 10, 2023 · 78872a9 · 78872a9
1 parent 6611c64
commit 78872a9
Show file tree

Hide file tree

Showing 4 changed files with 17 additions and 13 deletions.
diff --git a/modules/cga/module.c b/modules/cga/module.c
@@ -32,7 +32,7 @@ static struct vxt_pirepheral *cga_module_create(vxt_allocator *alloc, void *fron
         return NULL;
 
     struct frontend_interface *fi = (struct frontend_interface*)frontend;
-    if (fi->set_video_adapter) {
+    if (fi && fi->set_video_adapter) {
 		struct frontend_video_adapter a = {
 			p,
 			&cga_border_color,

diff --git a/modules/chipset/pcxt.c b/modules/chipset/pcxt.c
@@ -70,15 +70,17 @@ static struct vxt_pirepheral *ppi_create(vxt_allocator *alloc, void *frontend, c
     if (!p)
         return NULL;
 
-    struct frontend_interface *fi = (struct frontend_interface*)frontend;
-    if (fi->set_keyboard_controller) {
-        struct frontend_keyboard_controller controller = { p, &vxtu_ppi_key_event };
-        fi->set_keyboard_controller(&controller);
-    }
-    if (fi->set_audio_adapter) {
-        struct frontend_audio_adapter adapter = { p, &vxtu_ppi_generate_sample };
-        fi->set_audio_adapter(&adapter);
-    }
+	if (frontend) {
+		struct frontend_interface *fi = (struct frontend_interface*)frontend;
+		if (fi->set_keyboard_controller) {
+			struct frontend_keyboard_controller controller = { p, &vxtu_ppi_key_event };
+			fi->set_keyboard_controller(&controller);
+		}
+		if (fi->set_audio_adapter) {
+			struct frontend_audio_adapter adapter = { p, &vxtu_ppi_generate_sample };
+			fi->set_audio_adapter(&adapter);
+		}
+	}
 
     p->config = &ppi_config;
     return p;

diff --git a/modules/disk/disk.c b/modules/disk/disk.c
@@ -25,10 +25,12 @@
 
 static struct vxt_pirepheral *disk_create(vxt_allocator *alloc, void *frontend, const char *args) {
     (void)args;
+
     struct frontend_interface *fi = (struct frontend_interface*)frontend;
+    if (!fi) return NULL;
+
     struct vxt_pirepheral *p = vxtu_disk_create(alloc, &fi->disk.di);
-    if (!p)
-        return NULL;
+    if (!p) return NULL;
 
     if (fi->set_disk_controller) {
 		struct frontend_disk_controller c = {

diff --git a/modules/mouse/mouse.c b/modules/mouse/mouse.c
@@ -119,7 +119,7 @@ static struct vxt_pirepheral *create(vxt_allocator *alloc, void *frontend, const
     }
 
     struct frontend_interface *fi = (struct frontend_interface*)frontend;
-    if (fi->set_mouse_adapter) {
+    if (fi && fi->set_mouse_adapter) {
 		struct frontend_mouse_adapter a;
         a.device = (struct vxt_pirepheral*)PIREPHERAL;
         a.push_event = &push_event;