Fix casting unaligned access warning

ps2homebrew · Jun 26, 2021 · b4469b2 · b4469b2
1 parent 72c0cb0
commit b4469b2
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 5 deletions.
diff --git a/modules/iopcore/cdvdman/device-smb.c b/modules/iopcore/cdvdman/device-smb.c
@@ -81,7 +81,7 @@ void DeviceFSInit(void)
             sprintf(tmp_str, "\\%s\\%s", cdvdman_settings.common.media == 0x12 ? "CD" : "DVD", cdvdman_settings.filename);
         }
 
-        smb_OpenAndX(tmp_str, &cdvdman_settings.FIDs[i++], 0);
+        smb_OpenAndX(tmp_str, (u8 *)&cdvdman_settings.FIDs[i++], 0);
     } else {
         // Open all parts files
         for (i = 0; i < cdvdman_settings.common.NumParts; i++) {
@@ -90,7 +90,7 @@ void DeviceFSInit(void)
             else
                 sprintf(tmp_str, "\\%s.%02x", cdvdman_settings.filename, i);
 
-            smb_OpenAndX(tmp_str, &cdvdman_settings.FIDs[i], 0);
+            smb_OpenAndX(tmp_str, (u8 *)&cdvdman_settings.FIDs[i], 0);
         }
     }
 }

diff --git a/modules/iopcore/cdvdman/smb.c b/modules/iopcore/cdvdman/smb.c
@@ -494,7 +494,7 @@ int smb_TreeConnectAndX(char *ShareName)
 }
 
 //-------------------------------------------------------------------------
-int smb_OpenAndX(char *filename, u16 *FID, int Write)
+int smb_OpenAndX(char *filename, u8 *FID, int Write)
 {
     OpenAndXRequest_t *OR = &SMB_buf.smb.openAndXRequest;
     OpenAndXResponse_t *ORsp = &SMB_buf.smb.openAndXResponse;
@@ -543,7 +543,7 @@ int smb_OpenAndX(char *filename, u16 *FID, int Write)
         return -1000;
     }
 
-    *FID = ORsp->FID;
+    memcpy(FID, &ORsp->FID, 2);
 
     SIGNALIOSEMA(smb_io_sema);
 

diff --git a/modules/iopcore/cdvdman/smb.h b/modules/iopcore/cdvdman/smb.h
@@ -501,7 +501,7 @@ int smb_NegotiateProtocol(char *SMBServerIP, int SMBServerPort, char *Username,
 int smb_SessionSetupTreeConnect(char *share_name);
 int smb_SessionSetupAndX(u32 capabilities); // process a Session Setup message, for NT LM 0.12 dialect, Non Extended Security negociated
 int smb_TreeConnectAndX(char *ShareName);
-int smb_OpenAndX(char *filename, u16 *FID, int Write); // process a Open AndX message
+int smb_OpenAndX(char *filename, u8 *FID, int Write); // process a Open AndX message
 int smb_Close(int FID);
 int smb_ReadFile(u16 FID, u32 offsetlow, u32 offsethigh, void *readbuf, int nbytes);
 int smb_WriteFile(u16 FID, u32 offsetlow, u32 offsethigh, void *writebuf, int nbytes);