Skip to content

Conversation

@AliceLR
Copy link
Contributor

@AliceLR AliceLR commented Jan 29, 2022

More stuff that needed attention from #66 and #67, from the loaders I didn't check for that patch. I had to turn off UBSan for testing these loaders because it seems that the MT2 loader (and maybe others) also has alignment issues like Oktalyzer did.

There will be a third patch for the MIDI loader, after which I think all of the merge conflicts between those two branches should be resolved. I split it off of this patch because there are no clean options for fixing it.

  • MDL: tweaked oob_read_fixes check at 305 to break from loop.
  • MDL: oob_read_fixes check at 313 and fuzz-patch-1 check at 309 are redundant. Removed 313 since 309 is outside of the loop.
  • MT2: the oob_read_fixes check at line 291 was kind of broken. Replaced with the fuzz-patch-1 variant of that check.
  • MT2: combine the two checks on line 563.

* MDL: tweaked oob_read_fixes check at 305 to break from loop.
* MDL: oob_read_fixes check at 313 and fuzz-patch-1 check at 309
  are redundant. Removed 313 since 309 is outside of the loop.
* MT2: the oob_read_fixes check at line 291 was kind of broken.
  Replaced with the fuzz-patch-1 variant of that check.
* MT2: combine the two checks on line 563.
sezero pushed a commit to sezero/libmodplug that referenced this pull request Jan 29, 2022
* MDL: tweaked oob_read_fixes check at 305 to break from loop.
* MDL: oob_read_fixes check at 313 and fuzz-patch-1 check at 309
  are redundant. Removed 313 since 309 is outside of the loop.
* MT2: the oob_read_fixes check at line 291 was kind of broken.
  Replaced with the fuzz-patch-1 variant of that check.
* MT2: combine the two checks on line 563.

Konstanty#75
@Konstanty Konstanty merged commit 8d0b03a into Konstanty:master Jan 29, 2022
@AliceLR AliceLR deleted the cleanup-66-2 branch January 29, 2022 13:35
sezero pushed a commit to sezero/libmodplug that referenced this pull request Jan 31, 2022
* MDL: tweaked oob_read_fixes check at 305 to break from loop.
* MDL: oob_read_fixes check at 313 and fuzz-patch-1 check at 309
  are redundant. Removed 313 since 309 is outside of the loop.
* MT2: the oob_read_fixes check at line 291 was kind of broken.
  Replaced with the fuzz-patch-1 variant of that check.
* MT2: combine the two checks on line 563.

Konstanty#75
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants