Skip to content

Do not overwrite const file data provided by the user in PSM loader. #36

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom
Merged
merged 1 commit into from
Aug 2, 2018
Merged

Do not overwrite const file data provided by the user in PSM loader. #36

merged 1 commit into from
Aug 2, 2018

Conversation

sagamusix
Copy link
Contributor

This completely broke loading of MT2 files and garbled the song title of MOD files. Fixes #33.

@sagamusix
Do not overwrite const file data provided by the user in PSM loader. …
6e38479 
…This completely broke loading of MT2 files and garbled the song title of MOD files. Fixes #33.
@Konstanty Konstanty merged commit af00e21 into Konstanty:master Aug 2, 2018
berenm pushed a commit to bminor/SDL_mixer that referenced this pull request Oct 24, 2018
@sezero
update / reconfigure libmodplug and rebuild it:
26c71c3 
- disable wav formats handling: SDL_mixer has its own code for it.
- disable midi formats handling: SDL_mixer has timidity or native midi for it.
- disable experimental (possibly broken) file save support: not used, ever.
- don't export cplusplus interface from shared libs. SDL_mixer doesn't use it.
- disable mmcmp unpacking. disable broken pp20 unpacking.
- merge Konstanty/libmodplug#36 (fix PSM loader overwrites const data)
- merge Konstanty/libmodplug#39 (case-sensitive STM signature checks)
- merge Konstanty/libmodplug#40 (big-endian-friendly MDL track length read)
- merge Konstanty/libmodplug#24 (make some stuff static)
- merge Konstanty/libmodplug#14 (NO_PACKING and MODPLUG_NO_FILESAVE ifdefs)
- merge Konstanty/libmodplug#32 (replace setenv)
- merge Konstanty/libmodplug#41 (timidity paths update)
SDL-mirror-bot pushed a commit to SDL-mirror/SDL_mixer that referenced this pull request Oct 24, 2018
@sezero
update / reconfigure libmodplug and rebuild it:
c02f808 
- disable wav formats handling: SDL_mixer has its own code for it.
- disable midi formats handling: SDL_mixer has timidity or native midi for it.
- disable experimental (possibly broken) file save support: not used, ever.
- don't export cplusplus interface from shared libs. SDL_mixer doesn't use it.
- disable mmcmp unpacking. disable broken pp20 unpacking.
- merge Konstanty/libmodplug#36 (fix PSM loader overwrites const data)
- merge Konstanty/libmodplug#39 (case-sensitive STM signature checks)
- merge Konstanty/libmodplug#40 (big-endian-friendly MDL track length read)
- merge Konstanty/libmodplug#24 (make some stuff static)
- merge Konstanty/libmodplug#14 (NO_PACKING and MODPLUG_NO_FILESAVE ifdefs)
- merge Konstanty/libmodplug#32 (replace setenv)
- merge Konstanty/libmodplug#41 (timidity paths update)
@carstene1ns
Copy link

Unfortunately this commit breaks now PSM playback on powerpc (wii) for me.

@sagamusix
Copy link
Contributor Author

sagamusix commented Jan 8, 2019 •
edited
Loading

Turns out that it relies on the in-memory swapping already being done at an earlier step when reading patterns... this code is a big mess.

libmodplug/src/load_psm.cpp

Line 282 in 6e38479

ULONG len = *(DWORD *)(lpStream+patptrs[nPat]+4) - 12;
is missing a bswapLE32.

Akaricchi pushed a commit to taisei-project/SDL2_mixer that referenced this pull request Jun 2, 2020
@sezero
update / reconfigure libmodplug and rebuild it:
84c4037 
- disable wav formats handling: SDL_mixer has its own code for it.
- disable midi formats handling: SDL_mixer has timidity or native midi for it.
- disable experimental (possibly broken) file save support: not used, ever.
- don't export cplusplus interface from shared libs. SDL_mixer doesn't use it.
- disable mmcmp unpacking. disable broken pp20 unpacking.
- merge Konstanty/libmodplug#36 (fix PSM loader overwrites const data)
- merge Konstanty/libmodplug#39 (case-sensitive STM signature checks)
- merge Konstanty/libmodplug#40 (big-endian-friendly MDL track length read)
- merge Konstanty/libmodplug#24 (make some stuff static)
- merge Konstanty/libmodplug#14 (NO_PACKING and MODPLUG_NO_FILESAVE ifdefs)
- merge Konstanty/libmodplug#32 (replace setenv)
- merge Konstanty/libmodplug#41 (timidity paths update)
AliceLR added a commit to AliceLR/libmodplug that referenced this pull request Jun 14, 2021
@AliceLR
Fix more PSM breakage introduced by Konstanty#36, 6e38479.
b04985a
@AliceLR AliceLR mentioned this pull request Jun 14, 2021
Closed
icculus pushed a commit to icculus/SDL_sound that referenced this pull request Jun 28, 2021
@sezero
libmodplug (ReadPSM): Do not overwrite const file data from the user.
16b5c9f 
This completely broke loading of MT2 files, and garbled the song title
of MOD files.  Fixes Konstanty/libmodplug#33
patch by Saga Musix:  Konstanty/libmodplug#36.
icculus pushed a commit to icculus/SDL_sound that referenced this pull request Jun 28, 2021
@sezero
libmodplug (ReadPSM): Do not overwrite const file data from the user.
bc4cded 
This completely broke loading of MT2 files, and garbled the song title
of MOD files.  Fixes Konstanty/libmodplug#33
patch by Saga Musix:  Konstanty/libmodplug#36.
icculus pushed a commit to icculus/SDL_sound that referenced this pull request Jun 28, 2021
@sezero
libmodplug (ReadPSM): Do not overwrite const file data from the user.
73d2cfa 
This completely broke loading of MT2 files, and garbled the song title
of MOD files.  Fixes Konstanty/libmodplug#33
patch by Saga Musix:  Konstanty/libmodplug#36.
icculus pushed a commit to icculus/SDL_sound that referenced this pull request Jun 28, 2021
@sezero
libmodplug (ReadPSM): Do not overwrite const file data from the user.
b42f00c 
This completely broke loading of MT2 files, and garbled the song title
of MOD files.  Fixes Konstanty/libmodplug#33
patch by Saga Musix:  Konstanty/libmodplug#36.
Wolf3s pushed a commit to Wolf3s/PS2SDL_mixer-1.2.12 that referenced this pull request Mar 30, 2024
@sezero
update / reconfigure libmodplug and rebuild it:
87f086e 
- disable wav formats handling: SDL_mixer has its own code for it.
- disable midi formats handling: SDL_mixer has timidity or native midi for it.
- disable experimental (possibly broken) file save support: not used, ever.
- don't export cplusplus interface from shared libs. SDL_mixer doesn't use it.
- disable mmcmp unpacking. disable broken pp20 unpacking.
- merge Konstanty/libmodplug#36 (fix PSM loader overwrites const data)
- merge Konstanty/libmodplug#39 (case-sensitive STM signature checks)
- merge Konstanty/libmodplug#40 (big-endian-friendly MDL track length read)
- merge Konstanty/libmodplug#24 (make some stuff static)
- merge Konstanty/libmodplug#14 (NO_PACKING and MODPLUG_NO_FILESAVE ifdefs)
- merge Konstanty/libmodplug#32 (replace setenv)
- merge Konstanty/libmodplug#41 (timidity paths update)
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
3 participants
@sagamusix @carstene1ns @Konstanty