Merge branch 'master' of https://github.com/86Box/86Box

Cacodemon345 · Jan 21, 2024 · c9e74d8 · c9e74d8
2 parents bd2ef68 + d9607ae
commit c9e74d8
Show file tree

Hide file tree

Showing 4 changed files with 218 additions and 122 deletions.
diff --git a/src/include/86box/net_tulip.h b/src/include/86box/net_tulip.h
@@ -1,3 +1,4 @@
 extern const device_t dec_tulip_device;
 extern const device_t dec_tulip_21140_device;
 extern const device_t dec_tulip_21140_vpc_device;
+extern const device_t dec_tulip_21040_device;
diff --git a/src/network/net_eeprom_nmc93cxx.c b/src/network/net_eeprom_nmc93cxx.c
@@ -263,6 +263,8 @@ nmc93cxx_eeprom_close(void *priv)
 uint16_t *
 nmc93cxx_eeprom_data(nmc93cxx_eeprom_t *eeprom)
 {
+    if (UNLIKELY(!eeprom))
+        return NULL;
     /* Get EEPROM data array. */
     return &eeprom->dev.data[0];
 }