Menu
▾
▴
modplug-svn-commit — OpenMPT subversion commit notifications
You can subscribe to this list here.
| 2006 |
Jan
|
Feb
|
Mar
(1) |
Apr
(1) |
May
|
Jun
(1) |
Jul
|
Aug
(10) |
Sep
|
Oct
|
Nov
|
Dec
(3) |
|---|---|---|---|---|---|---|---|---|---|---|---|---|
| 2007 |
Jan
(1) |
Feb
(2) |
Mar
(3) |
Apr
(2) |
May
(10) |
Jun
(2) |
Jul
(1) |
Aug
|
Sep
|
Oct
|
Nov
(3) |
Dec
|
| 2008 |
Jan
(6) |
Feb
(4) |
Mar
(5) |
Apr
(2) |
May
(1) |
Jun
(1) |
Jul
(4) |
Aug
(6) |
Sep
(2) |
Oct
(9) |
Nov
(1) |
Dec
(4) |
| 2009 |
Jan
(9) |
Feb
(2) |
Mar
(2) |
Apr
(2) |
May
(6) |
Jun
(18) |
Jul
(33) |
Aug
(39) |
Sep
(33) |
Oct
(24) |
Nov
(23) |
Dec
(22) |
| 2010 |
Jan
(29) |
Feb
(32) |
Mar
(51) |
Apr
(17) |
May
(31) |
Jun
(21) |
Jul
(32) |
Aug
(28) |
Sep
(35) |
Oct
(27) |
Nov
(11) |
Dec
(13) |
| 2011 |
Jan
(14) |
Feb
(13) |
Mar
(27) |
Apr
(27) |
May
(28) |
Jun
(20) |
Jul
(43) |
Aug
(52) |
Sep
(66) |
Oct
(61) |
Nov
(11) |
Dec
(8) |
| 2012 |
Jan
(20) |
Feb
(30) |
Mar
(38) |
Apr
(21) |
May
(33) |
Jun
(21) |
Jul
(25) |
Aug
(9) |
Sep
(24) |
Oct
(42) |
Nov
(27) |
Dec
(41) |
| 2013 |
Jan
(20) |
Feb
(35) |
Mar
(156) |
Apr
(298) |
May
(258) |
Jun
(201) |
Jul
(105) |
Aug
(60) |
Sep
(193) |
Oct
(245) |
Nov
(280) |
Dec
(194) |
| 2014 |
Jan
(63) |
Feb
(202) |
Mar
(200) |
Apr
(23) |
May
(53) |
Jun
(105) |
Jul
(18) |
Aug
(26) |
Sep
(110) |
Oct
(187) |
Nov
(97) |
Dec
(74) |
| 2015 |
Jan
(45) |
Feb
(55) |
Mar
(116) |
Apr
(116) |
May
(193) |
Jun
(164) |
Jul
(50) |
Aug
(111) |
Sep
(98) |
Oct
(71) |
Nov
(103) |
Dec
(63) |
| 2016 |
Jan
(33) |
Feb
(101) |
Mar
(182) |
Apr
(139) |
May
(140) |
Jun
(103) |
Jul
(165) |
Aug
(286) |
Sep
(208) |
Oct
(127) |
Nov
(97) |
Dec
(54) |
| 2017 |
Jan
(64) |
Feb
(335) |
Mar
(202) |
Apr
(212) |
May
(139) |
Jun
(127) |
Jul
(294) |
Aug
(154) |
Sep
(170) |
Oct
(152) |
Nov
(156) |
Dec
(62) |
| 2018 |
Jan
(168) |
Feb
(237) |
Mar
(196) |
Apr
(174) |
May
(174) |
Jun
(161) |
Jul
(127) |
Aug
(88) |
Sep
(149) |
Oct
(66) |
Nov
(52) |
Dec
(135) |
| 2019 |
Jan
(146) |
Feb
(126) |
Mar
(104) |
Apr
(58) |
May
(60) |
Jun
(28) |
Jul
(197) |
Aug
(129) |
Sep
(141) |
Oct
(148) |
Nov
(63) |
Dec
(100) |
| 2020 |
Jan
(74) |
Feb
(37) |
Mar
(59) |
Apr
(154) |
May
(194) |
Jun
(133) |
Jul
(313) |
Aug
(197) |
Sep
(49) |
Oct
(162) |
Nov
(143) |
Dec
(57) |
| 2021 |
Jan
(120) |
Feb
(107) |
Mar
(314) |
Apr
(157) |
May
(524) |
Jun
(169) |
Jul
(72) |
Aug
(133) |
Sep
(135) |
Oct
(146) |
Nov
(198) |
Dec
(325) |
| 2022 |
Jan
(409) |
Feb
(249) |
Mar
(138) |
Apr
(95) |
May
(102) |
Jun
(221) |
Jul
(66) |
Aug
(120) |
Sep
(192) |
Oct
(131) |
Nov
(53) |
Dec
(171) |
| 2023 |
Jan
(357) |
Feb
(82) |
Mar
(168) |
Apr
(218) |
May
(196) |
Jun
(86) |
Jul
(115) |
Aug
(49) |
Sep
(190) |
Oct
(102) |
Nov
(45) |
Dec
(76) |
| 2024 |
Jan
(86) |
Feb
(50) |
Mar
(324) |
Apr
(209) |
May
(197) |
Jun
(232) |
Jul
(194) |
Aug
(247) |
Sep
(219) |
Oct
(266) |
Nov
(328) |
Dec
(304) |
| 2025 |
Jan
(191) |
Feb
(115) |
Mar
(137) |
Apr
(32) |
May
(126) |
Jun
(380) |
Jul
|
Aug
|
Sep
|
Oct
|
Nov
|
Dec
|
|
From: <sv...@op...> - 2025-06-17 18:14:43
|
Author: manx Date: Tue Jun 17 20:14:30 2025 New Revision: 23553 URL: https://source.openmpt.org/browse/openmpt/?op=revision&rev=23553 Log: Merged revision(s) 23551 from trunk/OpenMPT: [Ref] Reverb: ftol() should be static. ........ Modified: branches/OpenMPT-1.32/ (props changed) branches/OpenMPT-1.32/sounddsp/Reverb.cpp Modified: branches/OpenMPT-1.32/sounddsp/Reverb.cpp ============================================================================== --- branches/OpenMPT-1.32/sounddsp/Reverb.cpp Tue Jun 17 20:14:01 2025 (r23552) +++ branches/OpenMPT-1.32/sounddsp/Reverb.cpp Tue Jun 17 20:14:30 2025 (r23553) @@ -159,7 +159,7 @@ // Implementation // -MPT_FORCEINLINE int32 ftol(float f) { return static_cast<int32>(f); } +static MPT_FORCEINLINE int32 ftol(float f) { return static_cast<int32>(f); } static void I3dl2_to_Generic( const SNDMIX_REVERB_PROPERTIES *pReverb, |
|
From: <sv...@op...> - 2025-06-17 18:14:14
|
Author: manx Date: Tue Jun 17 20:14:01 2025 New Revision: 23552 URL: https://source.openmpt.org/browse/openmpt/?op=revision&rev=23552 Log: [Ref] Reverb: gReflectionsPreset can be static. Modified: trunk/OpenMPT/sounddsp/Reverb.cpp Modified: trunk/OpenMPT/sounddsp/Reverb.cpp ============================================================================== --- trunk/OpenMPT/sounddsp/Reverb.cpp Tue Jun 17 20:12:24 2025 (r23551) +++ trunk/OpenMPT/sounddsp/Reverb.cpp Tue Jun 17 20:14:01 2025 (r23552) @@ -157,7 +157,7 @@ int16 sGainLL, sGainRR, sGainLR, sGainRL; }; -const REFLECTIONPRESET gReflectionsPreset[ENVIRONMENT_NUMREFLECTIONS] = +static const REFLECTIONPRESET gReflectionsPreset[ENVIRONMENT_NUMREFLECTIONS] = { // %Delay, ll, rr, lr, rl {0, 9830, 6554, 0, 0}, |
|
From: <sv...@op...> - 2025-06-17 18:12:31
|
Author: manx Date: Tue Jun 17 20:12:24 2025 New Revision: 23551 URL: https://source.openmpt.org/browse/openmpt/?op=revision&rev=23551 Log: [Ref] Reverb: ftol() should be static. Modified: trunk/OpenMPT/sounddsp/Reverb.cpp Modified: trunk/OpenMPT/sounddsp/Reverb.cpp ============================================================================== --- trunk/OpenMPT/sounddsp/Reverb.cpp Tue Jun 17 16:08:03 2025 (r23550) +++ trunk/OpenMPT/sounddsp/Reverb.cpp Tue Jun 17 20:12:24 2025 (r23551) @@ -175,7 +175,7 @@ // Implementation // -MPT_FORCEINLINE int32 ftol(float f) { return static_cast<int32>(f); } +static MPT_FORCEINLINE int32 ftol(float f) { return static_cast<int32>(f); } static void I3dl2_to_Generic( const SNDMIX_REVERB_PROPERTIES *pReverb, |
|
From: <sv...@op...> - 2025-06-17 14:08:14
|
Author: manx Date: Tue Jun 17 16:08:03 2025 New Revision: 23550 URL: https://source.openmpt.org/browse/openmpt/?op=revision&rev=23550 Log: [Ref] mpt/base/macros.hpp: Add version constraints for MSVC attributes. Modified: trunk/OpenMPT/src/mpt/base/macros.hpp Modified: trunk/OpenMPT/src/mpt/base/macros.hpp ============================================================================== --- trunk/OpenMPT/src/mpt/base/macros.hpp Tue Jun 17 15:35:22 2025 (r23549) +++ trunk/OpenMPT/src/mpt/base/macros.hpp Tue Jun 17 16:08:03 2025 (r23550) @@ -16,7 +16,11 @@ #if MPT_COMPILER_MSVC +#if MPT_MSVC_AT_LEAST(2022, 0) #define MPT_ATTR_FLATTEN [[msvc::flatten]] +#else +#define MPT_ATTR_FLATTEN +#endif #elif MPT_COMPILER_GCC || MPT_COMPILER_CLANG #define MPT_ATTR_FLATTEN [[gnu::flatten]] #else @@ -26,7 +30,11 @@ #if MPT_COMPILER_MSVC +#if MPT_MSVC_AT_LEAST(2019, 1) && MPT_CXX_AT_LEAST(20) #define MPT_ATTR_NOINLINE [[msvc::noinline]] +#else +#define MPT_ATTR_NOINLINE +#endif #elif MPT_COMPILER_GCC || MPT_COMPILER_CLANG #define MPT_ATTR_NOINLINE [[gnu::noinline]] #else @@ -36,7 +44,11 @@ #if MPT_COMPILER_MSVC +#if MPT_MSVC_AT_LEAST(2019, 1) && MPT_CXX_AT_LEAST(20) #define MPT_ATTR_ALWAYSINLINE [[msvc::forceinline]] +#else +#define MPT_ATTR_ALWAYSINLINE +#endif #elif MPT_COMPILER_GCC || MPT_COMPILER_CLANG #define MPT_ATTR_ALWAYSINLINE [[gnu::always_inline]] #else |
|
From: <sv...@op...> - 2025-06-17 13:35:28
|
Author: manx Date: Tue Jun 17 15:35:22 2025 New Revision: 23549 URL: https://source.openmpt.org/browse/openmpt/?op=revision&rev=23549 Log: [Ref] mpt/base/macros.hpp: Add MPT_ATTR_FLATTEN. [Ref] mpt/base/macros.hpp: Add MPT_ATTR_NOINLINE, a C++ attribute version of MPT_NOINLINE. [Ref] mpt/base/macros.hpp: Add MPT_ATTR_ALWAYSINLINE. This is similar to a C++ attribute version of MPT_FORCEINLINE, however for MSVC __forceinline implies inline, which a C++ attribute cannot do. We thus choose the better matching GCC/Clang-inspired name. Modified: trunk/OpenMPT/src/mpt/base/macros.hpp Modified: trunk/OpenMPT/src/mpt/base/macros.hpp ============================================================================== --- trunk/OpenMPT/src/mpt/base/macros.hpp Tue Jun 17 15:31:41 2025 (r23548) +++ trunk/OpenMPT/src/mpt/base/macros.hpp Tue Jun 17 15:35:22 2025 (r23549) @@ -16,11 +16,11 @@ #if MPT_COMPILER_MSVC -#define MPT_ATTR_NOINLINE [[msvc::flatten]] +#define MPT_ATTR_FLATTEN [[msvc::flatten]] #elif MPT_COMPILER_GCC || MPT_COMPILER_CLANG -#define MPT_ATTR_NOINLINE [[gnu::flatten]] +#define MPT_ATTR_FLATTEN [[gnu::flatten]] #else -#define MPT_ATTR_NOINLINE +#define MPT_ATTR_FLATTEN #endif |
|
From: <sv...@op...> - 2025-06-17 13:31:54
|
Author: manx Date: Tue Jun 17 15:31:41 2025 New Revision: 23548 URL: https://source.openmpt.org/browse/openmpt/?op=revision&rev=23548 Log: [Ref] mpt/base/macros.hpp: Add MPT_ATTR_FLATTEN. [Ref] mpt/base/macros.hpp: Add MPT_ATTR_NOINLINE, a C++ attribute version of MPT_NOINLINE. [Ref] mpt/base/macros.hpp: Add MPT_ATTR_ALWAYSINLINE. This is similar to a C++ attribute version of MPT_FORCEINLINE, however for MSVC __forceinline implies inline, which a C++ attribute cannot do. We thus choose the better matching GCC/Clang-inspired name. Modified: trunk/OpenMPT/src/mpt/base/macros.hpp Modified: trunk/OpenMPT/src/mpt/base/macros.hpp ============================================================================== --- trunk/OpenMPT/src/mpt/base/macros.hpp Mon Jun 16 19:41:27 2025 (r23547) +++ trunk/OpenMPT/src/mpt/base/macros.hpp Tue Jun 17 15:31:41 2025 (r23548) @@ -15,7 +15,36 @@ -// Advanced inline attributes +#if MPT_COMPILER_MSVC +#define MPT_ATTR_NOINLINE [[msvc::flatten]] +#elif MPT_COMPILER_GCC || MPT_COMPILER_CLANG +#define MPT_ATTR_NOINLINE [[gnu::flatten]] +#else +#define MPT_ATTR_NOINLINE +#endif + + + +#if MPT_COMPILER_MSVC +#define MPT_ATTR_NOINLINE [[msvc::noinline]] +#elif MPT_COMPILER_GCC || MPT_COMPILER_CLANG +#define MPT_ATTR_NOINLINE [[gnu::noinline]] +#else +#define MPT_ATTR_NOINLINE +#endif + + + +#if MPT_COMPILER_MSVC +#define MPT_ATTR_ALWAYSINLINE [[msvc::forceinline]] +#elif MPT_COMPILER_GCC || MPT_COMPILER_CLANG +#define MPT_ATTR_ALWAYSINLINE [[gnu::always_inline]] +#else +#define MPT_ATTR_ALWAYSINLINE +#endif + + + #if MPT_COMPILER_MSVC #define MPT_FORCEINLINE __forceinline #define MPT_NOINLINE __declspec(noinline) @@ -29,8 +58,6 @@ -// constexpr - #define MPT_CONSTEXPRINLINE constexpr MPT_FORCEINLINE #if MPT_CXX_AT_LEAST(23) |
|
From: <sv...@op...> - 2025-06-16 17:41:38
|
Author: manx Date: Mon Jun 16 19:41:27 2025 New Revision: 23547 URL: https://source.openmpt.org/browse/openmpt/?op=revision&rev=23547 Log: [Var] Update gitignore. Modified: branches/OpenMPT-1.28/.gitignore Modified: branches/OpenMPT-1.28/.gitignore ============================================================================== --- branches/OpenMPT-1.28/.gitignore Mon Jun 16 19:41:15 2025 (r23546) +++ branches/OpenMPT-1.28/.gitignore Mon Jun 16 19:41:27 2025 (r23547) @@ -458,6 +458,7 @@ /include/ogg/ogg-uninstalled.pc.in /include/ogg/ogg.m4 /include/ogg/ogg.pc.in +/include/ogg/test-driver /include/ogg/include/Makefile.am /include/ogg/include/Makefile.in /include/ogg/include/ogg/Makefile.am |
|
From: <sv...@op...> - 2025-06-16 17:41:26
|
Author: manx Date: Mon Jun 16 19:41:15 2025 New Revision: 23546 URL: https://source.openmpt.org/browse/openmpt/?op=revision&rev=23546 Log: [Var] Update gitignore. Modified: branches/OpenMPT-1.29/.gitignore Modified: branches/OpenMPT-1.29/.gitignore ============================================================================== --- branches/OpenMPT-1.29/.gitignore Mon Jun 16 19:41:02 2025 (r23545) +++ branches/OpenMPT-1.29/.gitignore Mon Jun 16 19:41:15 2025 (r23546) @@ -483,6 +483,7 @@ /include/ogg/ogg-uninstalled.pc.in /include/ogg/ogg.m4 /include/ogg/ogg.pc.in +/include/ogg/test-driver /include/ogg/include/Makefile.am /include/ogg/include/Makefile.in /include/ogg/include/ogg/Makefile.am |
|
From: <sv...@op...> - 2025-06-16 17:41:13
|
Author: manx Date: Mon Jun 16 19:41:02 2025 New Revision: 23545 URL: https://source.openmpt.org/browse/openmpt/?op=revision&rev=23545 Log: [Var] Update gitignore. Modified: branches/OpenMPT-1.30/.gitignore Modified: branches/OpenMPT-1.30/.gitignore ============================================================================== --- branches/OpenMPT-1.30/.gitignore Mon Jun 16 19:40:47 2025 (r23544) +++ branches/OpenMPT-1.30/.gitignore Mon Jun 16 19:41:02 2025 (r23545) @@ -505,6 +505,7 @@ /include/ogg/ogg-uninstalled.pc.in /include/ogg/ogg.m4 /include/ogg/ogg.pc.in +/include/ogg/test-driver /include/ogg/include/Makefile.am /include/ogg/include/Makefile.in /include/ogg/include/ogg/Makefile.am |
|
From: <sv...@op...> - 2025-06-16 17:40:59
|
Author: manx Date: Mon Jun 16 19:40:47 2025 New Revision: 23544 URL: https://source.openmpt.org/browse/openmpt/?op=revision&rev=23544 Log: [Var] Update gitignore. Modified: branches/OpenMPT-1.31/.gitignore Modified: branches/OpenMPT-1.31/.gitignore ============================================================================== --- branches/OpenMPT-1.31/.gitignore Mon Jun 16 19:40:33 2025 (r23543) +++ branches/OpenMPT-1.31/.gitignore Mon Jun 16 19:40:47 2025 (r23544) @@ -493,6 +493,7 @@ /include/ogg/ogg-uninstalled.pc.in /include/ogg/ogg.m4 /include/ogg/ogg.pc.in +/include/ogg/test-driver /include/ogg/include/Makefile.am /include/ogg/include/Makefile.in /include/ogg/include/ogg/Makefile.am |
|
From: <sv...@op...> - 2025-06-16 17:40:47
|
Author: manx Date: Mon Jun 16 19:40:33 2025 New Revision: 23543 URL: https://source.openmpt.org/browse/openmpt/?op=revision&rev=23543 Log: [Var] Update gitignore. Modified: branches/OpenMPT-1.32/.gitignore Modified: branches/OpenMPT-1.32/.gitignore ============================================================================== --- branches/OpenMPT-1.32/.gitignore Mon Jun 16 19:40:17 2025 (r23542) +++ branches/OpenMPT-1.32/.gitignore Mon Jun 16 19:40:33 2025 (r23543) @@ -488,6 +488,7 @@ /include/ogg/ogg-uninstalled.pc.in /include/ogg/ogg.m4 /include/ogg/ogg.pc.in +/include/ogg/test-driver /include/ogg/include/Makefile.am /include/ogg/include/Makefile.in /include/ogg/include/ogg/Makefile.am |
|
From: <sv...@op...> - 2025-06-16 17:40:28
|
Author: manx Date: Mon Jun 16 19:40:17 2025 New Revision: 23542 URL: https://source.openmpt.org/browse/openmpt/?op=revision&rev=23542 Log: [Var] Update gitignore. Modified: trunk/OpenMPT/.gitignore Modified: trunk/OpenMPT/.gitignore ============================================================================== --- trunk/OpenMPT/.gitignore Mon Jun 16 19:39:05 2025 (r23541) +++ trunk/OpenMPT/.gitignore Mon Jun 16 19:40:17 2025 (r23542) @@ -491,6 +491,7 @@ /include/ogg/ogg-uninstalled.pc.in /include/ogg/ogg.m4 /include/ogg/ogg.pc.in +/include/ogg/test-driver /include/ogg/include/Makefile.am /include/ogg/include/Makefile.in /include/ogg/include/ogg/Makefile.am |
|
From: <sv...@op...> - 2025-06-16 17:39:16
|
Author: manx Date: Mon Jun 16 19:39:05 2025 New Revision: 23541 URL: https://source.openmpt.org/browse/openmpt/?op=revision&rev=23541 Log: [Doc] libopenmpt: Update changelog. Modified: branches/OpenMPT-1.28/libopenmpt/dox/changelog.md Modified: branches/OpenMPT-1.28/libopenmpt/dox/changelog.md ============================================================================== --- branches/OpenMPT-1.28/libopenmpt/dox/changelog.md Mon Jun 16 19:38:57 2025 (r23540) +++ branches/OpenMPT-1.28/libopenmpt/dox/changelog.md Mon Jun 16 19:39:05 2025 (r23541) @@ -7,6 +7,8 @@ ### libopenmpt 0.4.50-pre + * ogg: Update to v1.3.6 (2025-06-16). + ### libopenmpt 0.4.49 (2025-06-14) * [**Bug**] `openmpt::string::get("source_has_mixed_revisions")` and |
|
From: <sv...@op...> - 2025-06-16 17:39:08
|
Author: manx Date: Mon Jun 16 19:38:57 2025 New Revision: 23540 URL: https://source.openmpt.org/browse/openmpt/?op=revision&rev=23540 Log: [Doc] libopenmpt: Update changelog. Modified: branches/OpenMPT-1.29/libopenmpt/dox/changelog.md Modified: branches/OpenMPT-1.29/libopenmpt/dox/changelog.md ============================================================================== --- branches/OpenMPT-1.29/libopenmpt/dox/changelog.md Mon Jun 16 19:38:24 2025 (r23539) +++ branches/OpenMPT-1.29/libopenmpt/dox/changelog.md Mon Jun 16 19:38:57 2025 (r23540) @@ -7,6 +7,8 @@ ### libopenmpt 0.5.38-pre + * ogg: Update to v1.3.6 (2025-06-16). + ### libopenmpt 0.5.37 (2025-06-14) * [**Bug**] `openmpt::string::get("source_has_mixed_revisions")` and |
|
From: <sv...@op...> - 2025-06-16 17:38:35
|
Author: manx Date: Mon Jun 16 19:38:24 2025 New Revision: 23539 URL: https://source.openmpt.org/browse/openmpt/?op=revision&rev=23539 Log: [Doc] libopenmpt: Update changelog. Modified: branches/OpenMPT-1.30/libopenmpt/dox/changelog.md Modified: branches/OpenMPT-1.30/libopenmpt/dox/changelog.md ============================================================================== --- branches/OpenMPT-1.30/libopenmpt/dox/changelog.md Mon Jun 16 19:38:04 2025 (r23538) +++ branches/OpenMPT-1.30/libopenmpt/dox/changelog.md Mon Jun 16 19:38:24 2025 (r23539) @@ -7,6 +7,8 @@ ### libopenmpt 0.6.24-pre + * ogg: Update to v1.3.6 (2025-06-16). + ### libopenmpt 0.6.23 (2025-06-14) * [**Bug**] `openmpt::string::get("source_has_mixed_revisions")` and |
|
From: <sv...@op...> - 2025-06-16 17:38:11
|
Author: manx Date: Mon Jun 16 19:38:04 2025 New Revision: 23538 URL: https://source.openmpt.org/browse/openmpt/?op=revision&rev=23538 Log: [Doc] libopenmpt: Update changelog. Modified: branches/OpenMPT-1.31/doc/libopenmpt/changelog.md Modified: branches/OpenMPT-1.31/doc/libopenmpt/changelog.md ============================================================================== --- branches/OpenMPT-1.31/doc/libopenmpt/changelog.md Mon Jun 16 19:37:48 2025 (r23537) +++ branches/OpenMPT-1.31/doc/libopenmpt/changelog.md Mon Jun 16 19:38:04 2025 (r23538) @@ -7,6 +7,8 @@ ### libopenmpt 0.7.15-pre + * ogg: Update to v1.3.6 (2025-06-16). + ### libopenmpt 0.7.14 (2025-06-14) * [**Bug**] `openmpt::string::get("source_has_mixed_revisions")` and |
|
From: <sv...@op...> - 2025-06-16 17:38:00
|
Author: manx Date: Mon Jun 16 19:37:48 2025 New Revision: 23537 URL: https://source.openmpt.org/browse/openmpt/?op=revision&rev=23537 Log: [Doc] libopenmpt: Update changelog. Modified: branches/OpenMPT-1.32/doc/libopenmpt/changelog.md Modified: branches/OpenMPT-1.32/doc/libopenmpt/changelog.md ============================================================================== --- branches/OpenMPT-1.32/doc/libopenmpt/changelog.md Mon Jun 16 19:37:02 2025 (r23536) +++ branches/OpenMPT-1.32/doc/libopenmpt/changelog.md Mon Jun 16 19:37:48 2025 (r23537) @@ -7,6 +7,8 @@ ### libopenmpt 0.8.2-pre + * ogg: Update to v1.3.6 (2025-06-16). + ### libopenmpt 0.8.1 (2025-06-14) * [**Bug**] Work-around broken user locale support on Haiku by always assuming |
|
From: <sv...@op...> - 2025-06-16 17:37:09
|
Author: manx Date: Mon Jun 16 19:37:02 2025 New Revision: 23536 URL: https://source.openmpt.org/browse/openmpt/?op=revision&rev=23536 Log: Merged revision(s) 23531 from trunk/OpenMPT: [Var] ogg: Update to 1.3.6 (2025-06-16). ........ Modified: branches/OpenMPT-1.28/ (props changed) branches/OpenMPT-1.28/include/ogg/ (props changed) branches/OpenMPT-1.28/include/ogg/CHANGES branches/OpenMPT-1.28/include/ogg/OpenMPT.txt branches/OpenMPT-1.28/include/ogg/src/bitwise.c branches/OpenMPT-1.28/include/ogg/src/framing.c Modified: branches/OpenMPT-1.28/include/ogg/CHANGES ============================================================================== --- branches/OpenMPT-1.28/include/ogg/CHANGES Mon Jun 16 19:36:43 2025 (r23535) +++ branches/OpenMPT-1.28/include/ogg/CHANGES Mon Jun 16 19:37:02 2025 (r23536) @@ -1,3 +1,13 @@ +Version 1.3.6 (2025 June 16) + + * Update minimum cmake version to 3.6 + This fixes incompatibility with cmake >= 4.0 + * Fix UBsan issues + * Improve allocation failure handling + * Fix various compiler warnings + * Fix various autotool warnings + * Improve continuous integration testing scripts + Version 1.3.5 (2020 June 3) * Fix unsigned typedef problem on macOS. Modified: branches/OpenMPT-1.28/include/ogg/OpenMPT.txt ============================================================================== --- branches/OpenMPT-1.28/include/ogg/OpenMPT.txt Mon Jun 16 19:36:43 2025 (r23535) +++ branches/OpenMPT-1.28/include/ogg/OpenMPT.txt Mon Jun 16 19:37:02 2025 (r23536) @@ -1,9 +1,7 @@ -libogg library version 1.3.5 (2021-06-04). +libogg library version 1.3.6 (2025-06-16). The following changes have been made: * Obviously, unnecessary folders and files (documentation, makefiles, etc.) have been removed. - * The following commits have been applied: - * https://gitlab.xiph.org/xiph/ogg/-/commit/7cf42ea17aef7bc1b7b21af70724840a96c2e7d0 * win32/ogg.def has been modified to not override the linker library name. * For building, premake is used to generate Visual Studio project files. See ../build/premake/ for details. Modified: branches/OpenMPT-1.28/include/ogg/src/bitwise.c ============================================================================== --- branches/OpenMPT-1.28/include/ogg/src/bitwise.c Mon Jun 16 19:36:43 2025 (r23535) +++ branches/OpenMPT-1.28/include/ogg/src/bitwise.c Mon Jun 16 19:37:02 2025 (r23536) @@ -39,6 +39,8 @@ void oggpack_writeinit(oggpack_buffer *b){ memset(b,0,sizeof(*b)); b->ptr=b->buffer=_ogg_malloc(BUFFER_INCREMENT); + if (!b->buffer) + return; b->buffer[0]='\0'; b->storage=BUFFER_INCREMENT; } @@ -565,17 +567,17 @@ int tbit=bits?bits:ilog(b[i]); if(oggpack_look(&r,tbit)==-1) report("out of data!\n"); - if(oggpack_look(&r,tbit)!=(b[i]&mask[tbit])) + if((unsigned long)oggpack_look(&r,tbit)!=(b[i]&mask[tbit])) report("looked at incorrect value!\n"); if(tbit==1) - if(oggpack_look1(&r)!=(b[i]&mask[tbit])) + if((unsigned long)oggpack_look1(&r)!=(b[i]&mask[tbit])) report("looked at single bit incorrect value!\n"); if(tbit==1){ - if(oggpack_read1(&r)!=(b[i]&mask[tbit])) + if((unsigned long)oggpack_read1(&r)!=(b[i]&mask[tbit])) report("read incorrect single bit value!\n"); }else{ - if(oggpack_read(&r,tbit)!=(b[i]&mask[tbit])) - report("read incorrect value!\n"); + if((unsigned long)oggpack_read(&r,tbit)!=(b[i]&mask[tbit])) + report("read incorrect value!\n"); } } if(oggpack_bytes(&r)!=bytes)report("leftover bytes after read!\n"); @@ -600,16 +602,16 @@ int tbit=bits?bits:ilog(b[i]); if(oggpackB_look(&r,tbit)==-1) report("out of data!\n"); - if(oggpackB_look(&r,tbit)!=(b[i]&mask[tbit])) + if((unsigned long)oggpackB_look(&r,tbit)!=(b[i]&mask[tbit])) report("looked at incorrect value!\n"); if(tbit==1) - if(oggpackB_look1(&r)!=(b[i]&mask[tbit])) + if((unsigned long)oggpackB_look1(&r)!=(b[i]&mask[tbit])) report("looked at single bit incorrect value!\n"); if(tbit==1){ - if(oggpackB_read1(&r)!=(b[i]&mask[tbit])) + if((unsigned long)oggpackB_read1(&r)!=(b[i]&mask[tbit])) report("read incorrect single bit value!\n"); }else{ - if(oggpackB_read(&r,tbit)!=(b[i]&mask[tbit])) + if((unsigned long)oggpackB_read(&r,tbit)!=(b[i]&mask[tbit])) report("read incorrect value!\n"); } } @@ -888,7 +890,7 @@ oggpack_readinit(&r,buffer,bytes); for(i=0;i<test2size;i++){ if(oggpack_look(&r,32)==-1)report("out of data. failed!"); - if(oggpack_look(&r,32)!=large[i]){ + if((unsigned long)oggpack_look(&r,32)!=large[i]){ fprintf(stderr,"%ld != %lu (%lx!=%lx):",oggpack_look(&r,32),large[i], oggpack_look(&r,32),large[i]); report("read incorrect value!\n"); @@ -998,7 +1000,7 @@ oggpackB_readinit(&r,buffer,bytes); for(i=0;i<test2size;i++){ if(oggpackB_look(&r,32)==-1)report("out of data. failed!"); - if(oggpackB_look(&r,32)!=large[i]){ + if((unsigned long)oggpackB_look(&r,32)!=large[i]){ fprintf(stderr,"%ld != %lu (%lx!=%lx):",oggpackB_look(&r,32),large[i], oggpackB_look(&r,32),large[i]); report("read incorrect value!\n"); Modified: branches/OpenMPT-1.28/include/ogg/src/framing.c ============================================================================== --- branches/OpenMPT-1.28/include/ogg/src/framing.c Mon Jun 16 19:36:43 2025 (r23535) +++ branches/OpenMPT-1.28/include/ogg/src/framing.c Mon Jun 16 19:37:02 2025 (r23536) @@ -1107,19 +1107,26 @@ fprintf(stderr,")\n\n"); } -void copy_page(ogg_page *og){ +static int copy_page(ogg_page *og){ unsigned char *temp=_ogg_malloc(og->header_len); + if (!temp) + return -1; memcpy(temp,og->header,og->header_len); og->header=temp; temp=_ogg_malloc(og->body_len); + if (!temp) + return -1; memcpy(temp,og->body,og->body_len); og->body=temp; + return 0; } -void free_page(ogg_page *og){ +static void free_page(ogg_page *og){ _ogg_free (og->header); + og->header=NULL; _ogg_free (og->body); + og->body=NULL; } void error(void){ @@ -1502,6 +1509,11 @@ int byteskipcount=0; + if (!data) { + fprintf(stderr,"unable to allocate requried data buffer!\n"); + exit(1); + } + ogg_stream_reset(&os_en); ogg_stream_reset(&os_de); ogg_sync_reset(&oy); @@ -1813,6 +1825,11 @@ int inptr=0,i,j; ogg_page og[5]; + if (!data) { + fprintf(stderr,"unable to allocate requried packet data buffer!\n"); + exit(1); + } + ogg_stream_reset(&os_en); for(i=0;pl[i]!=-1;i++){ @@ -1836,7 +1853,10 @@ fprintf(stderr,"Too few pages output building sync tests!\n"); exit(1); } - copy_page(&og[i]); + if (-1 == copy_page(&og[i])) { + fprintf(stderr,"unable to copy page building sync tests!\n"); + exit(1); + } } /* Test lost pages on pagein/packetout: no rollback */ |
|
From: <sv...@op...> - 2025-06-16 17:36:55
|
Author: manx Date: Mon Jun 16 19:36:43 2025 New Revision: 23535 URL: https://source.openmpt.org/browse/openmpt/?op=revision&rev=23535 Log: Merged revision(s) 23531 from trunk/OpenMPT: [Var] ogg: Update to 1.3.6 (2025-06-16). ........ Modified: branches/OpenMPT-1.29/ (props changed) branches/OpenMPT-1.29/include/ogg/ (props changed) branches/OpenMPT-1.29/include/ogg/CHANGES branches/OpenMPT-1.29/include/ogg/OpenMPT.txt branches/OpenMPT-1.29/include/ogg/src/bitwise.c branches/OpenMPT-1.29/include/ogg/src/framing.c Modified: branches/OpenMPT-1.29/include/ogg/CHANGES ============================================================================== --- branches/OpenMPT-1.29/include/ogg/CHANGES Mon Jun 16 19:36:23 2025 (r23534) +++ branches/OpenMPT-1.29/include/ogg/CHANGES Mon Jun 16 19:36:43 2025 (r23535) @@ -1,3 +1,13 @@ +Version 1.3.6 (2025 June 16) + + * Update minimum cmake version to 3.6 + This fixes incompatibility with cmake >= 4.0 + * Fix UBsan issues + * Improve allocation failure handling + * Fix various compiler warnings + * Fix various autotool warnings + * Improve continuous integration testing scripts + Version 1.3.5 (2020 June 3) * Fix unsigned typedef problem on macOS. Modified: branches/OpenMPT-1.29/include/ogg/OpenMPT.txt ============================================================================== --- branches/OpenMPT-1.29/include/ogg/OpenMPT.txt Mon Jun 16 19:36:23 2025 (r23534) +++ branches/OpenMPT-1.29/include/ogg/OpenMPT.txt Mon Jun 16 19:36:43 2025 (r23535) @@ -1,9 +1,7 @@ -libogg library version 1.3.5 (2021-06-04). +libogg library version 1.3.6 (2025-06-16). The following changes have been made: * Obviously, unnecessary folders and files (documentation, makefiles, etc.) have been removed. - * The following commits have been applied: - * https://gitlab.xiph.org/xiph/ogg/-/commit/7cf42ea17aef7bc1b7b21af70724840a96c2e7d0 * ports/makefile/ogg/config_types.h has been added for plain Makefile builds. * win32/ogg.def has been modified to not override the linker library name. * For building, premake is used to generate Visual Studio project files. Modified: branches/OpenMPT-1.29/include/ogg/src/bitwise.c ============================================================================== --- branches/OpenMPT-1.29/include/ogg/src/bitwise.c Mon Jun 16 19:36:23 2025 (r23534) +++ branches/OpenMPT-1.29/include/ogg/src/bitwise.c Mon Jun 16 19:36:43 2025 (r23535) @@ -39,6 +39,8 @@ void oggpack_writeinit(oggpack_buffer *b){ memset(b,0,sizeof(*b)); b->ptr=b->buffer=_ogg_malloc(BUFFER_INCREMENT); + if (!b->buffer) + return; b->buffer[0]='\0'; b->storage=BUFFER_INCREMENT; } @@ -565,17 +567,17 @@ int tbit=bits?bits:ilog(b[i]); if(oggpack_look(&r,tbit)==-1) report("out of data!\n"); - if(oggpack_look(&r,tbit)!=(b[i]&mask[tbit])) + if((unsigned long)oggpack_look(&r,tbit)!=(b[i]&mask[tbit])) report("looked at incorrect value!\n"); if(tbit==1) - if(oggpack_look1(&r)!=(b[i]&mask[tbit])) + if((unsigned long)oggpack_look1(&r)!=(b[i]&mask[tbit])) report("looked at single bit incorrect value!\n"); if(tbit==1){ - if(oggpack_read1(&r)!=(b[i]&mask[tbit])) + if((unsigned long)oggpack_read1(&r)!=(b[i]&mask[tbit])) report("read incorrect single bit value!\n"); }else{ - if(oggpack_read(&r,tbit)!=(b[i]&mask[tbit])) - report("read incorrect value!\n"); + if((unsigned long)oggpack_read(&r,tbit)!=(b[i]&mask[tbit])) + report("read incorrect value!\n"); } } if(oggpack_bytes(&r)!=bytes)report("leftover bytes after read!\n"); @@ -600,16 +602,16 @@ int tbit=bits?bits:ilog(b[i]); if(oggpackB_look(&r,tbit)==-1) report("out of data!\n"); - if(oggpackB_look(&r,tbit)!=(b[i]&mask[tbit])) + if((unsigned long)oggpackB_look(&r,tbit)!=(b[i]&mask[tbit])) report("looked at incorrect value!\n"); if(tbit==1) - if(oggpackB_look1(&r)!=(b[i]&mask[tbit])) + if((unsigned long)oggpackB_look1(&r)!=(b[i]&mask[tbit])) report("looked at single bit incorrect value!\n"); if(tbit==1){ - if(oggpackB_read1(&r)!=(b[i]&mask[tbit])) + if((unsigned long)oggpackB_read1(&r)!=(b[i]&mask[tbit])) report("read incorrect single bit value!\n"); }else{ - if(oggpackB_read(&r,tbit)!=(b[i]&mask[tbit])) + if((unsigned long)oggpackB_read(&r,tbit)!=(b[i]&mask[tbit])) report("read incorrect value!\n"); } } @@ -888,7 +890,7 @@ oggpack_readinit(&r,buffer,bytes); for(i=0;i<test2size;i++){ if(oggpack_look(&r,32)==-1)report("out of data. failed!"); - if(oggpack_look(&r,32)!=large[i]){ + if((unsigned long)oggpack_look(&r,32)!=large[i]){ fprintf(stderr,"%ld != %lu (%lx!=%lx):",oggpack_look(&r,32),large[i], oggpack_look(&r,32),large[i]); report("read incorrect value!\n"); @@ -998,7 +1000,7 @@ oggpackB_readinit(&r,buffer,bytes); for(i=0;i<test2size;i++){ if(oggpackB_look(&r,32)==-1)report("out of data. failed!"); - if(oggpackB_look(&r,32)!=large[i]){ + if((unsigned long)oggpackB_look(&r,32)!=large[i]){ fprintf(stderr,"%ld != %lu (%lx!=%lx):",oggpackB_look(&r,32),large[i], oggpackB_look(&r,32),large[i]); report("read incorrect value!\n"); Modified: branches/OpenMPT-1.29/include/ogg/src/framing.c ============================================================================== --- branches/OpenMPT-1.29/include/ogg/src/framing.c Mon Jun 16 19:36:23 2025 (r23534) +++ branches/OpenMPT-1.29/include/ogg/src/framing.c Mon Jun 16 19:36:43 2025 (r23535) @@ -1107,19 +1107,26 @@ fprintf(stderr,")\n\n"); } -void copy_page(ogg_page *og){ +static int copy_page(ogg_page *og){ unsigned char *temp=_ogg_malloc(og->header_len); + if (!temp) + return -1; memcpy(temp,og->header,og->header_len); og->header=temp; temp=_ogg_malloc(og->body_len); + if (!temp) + return -1; memcpy(temp,og->body,og->body_len); og->body=temp; + return 0; } -void free_page(ogg_page *og){ +static void free_page(ogg_page *og){ _ogg_free (og->header); + og->header=NULL; _ogg_free (og->body); + og->body=NULL; } void error(void){ @@ -1502,6 +1509,11 @@ int byteskipcount=0; + if (!data) { + fprintf(stderr,"unable to allocate requried data buffer!\n"); + exit(1); + } + ogg_stream_reset(&os_en); ogg_stream_reset(&os_de); ogg_sync_reset(&oy); @@ -1813,6 +1825,11 @@ int inptr=0,i,j; ogg_page og[5]; + if (!data) { + fprintf(stderr,"unable to allocate requried packet data buffer!\n"); + exit(1); + } + ogg_stream_reset(&os_en); for(i=0;pl[i]!=-1;i++){ @@ -1836,7 +1853,10 @@ fprintf(stderr,"Too few pages output building sync tests!\n"); exit(1); } - copy_page(&og[i]); + if (-1 == copy_page(&og[i])) { + fprintf(stderr,"unable to copy page building sync tests!\n"); + exit(1); + } } /* Test lost pages on pagein/packetout: no rollback */ |
|
From: <sv...@op...> - 2025-06-16 17:36:36
|
Author: manx Date: Mon Jun 16 19:36:23 2025 New Revision: 23534 URL: https://source.openmpt.org/browse/openmpt/?op=revision&rev=23534 Log: Merged revision(s) 23531 from trunk/OpenMPT: [Var] ogg: Update to 1.3.6 (2025-06-16). ........ Modified: branches/OpenMPT-1.30/ (props changed) branches/OpenMPT-1.30/include/ogg/ (props changed) branches/OpenMPT-1.30/include/ogg/CHANGES branches/OpenMPT-1.30/include/ogg/OpenMPT.txt branches/OpenMPT-1.30/include/ogg/src/bitwise.c branches/OpenMPT-1.30/include/ogg/src/framing.c Modified: branches/OpenMPT-1.30/include/ogg/CHANGES ============================================================================== --- branches/OpenMPT-1.30/include/ogg/CHANGES Mon Jun 16 19:36:05 2025 (r23533) +++ branches/OpenMPT-1.30/include/ogg/CHANGES Mon Jun 16 19:36:23 2025 (r23534) @@ -1,3 +1,13 @@ +Version 1.3.6 (2025 June 16) + + * Update minimum cmake version to 3.6 + This fixes incompatibility with cmake >= 4.0 + * Fix UBsan issues + * Improve allocation failure handling + * Fix various compiler warnings + * Fix various autotool warnings + * Improve continuous integration testing scripts + Version 1.3.5 (2020 June 3) * Fix unsigned typedef problem on macOS. Modified: branches/OpenMPT-1.30/include/ogg/OpenMPT.txt ============================================================================== --- branches/OpenMPT-1.30/include/ogg/OpenMPT.txt Mon Jun 16 19:36:05 2025 (r23533) +++ branches/OpenMPT-1.30/include/ogg/OpenMPT.txt Mon Jun 16 19:36:23 2025 (r23534) @@ -1,9 +1,7 @@ -libogg library version 1.3.5 (2021-06-04). +libogg library version 1.3.6 (2025-06-16). The following changes have been made: * Obviously, unnecessary folders and files (documentation, makefiles, etc.) have been removed. - * The following commits have been applied: - * https://gitlab.xiph.org/xiph/ogg/-/commit/7cf42ea17aef7bc1b7b21af70724840a96c2e7d0 * ports/makefile/ogg/config_types.h has been added for plain Makefile builds. * win32/ogg.def has been modified to not override the linker library name. * For building, premake is used to generate Visual Studio project files. Modified: branches/OpenMPT-1.30/include/ogg/src/bitwise.c ============================================================================== --- branches/OpenMPT-1.30/include/ogg/src/bitwise.c Mon Jun 16 19:36:05 2025 (r23533) +++ branches/OpenMPT-1.30/include/ogg/src/bitwise.c Mon Jun 16 19:36:23 2025 (r23534) @@ -39,6 +39,8 @@ void oggpack_writeinit(oggpack_buffer *b){ memset(b,0,sizeof(*b)); b->ptr=b->buffer=_ogg_malloc(BUFFER_INCREMENT); + if (!b->buffer) + return; b->buffer[0]='\0'; b->storage=BUFFER_INCREMENT; } @@ -565,17 +567,17 @@ int tbit=bits?bits:ilog(b[i]); if(oggpack_look(&r,tbit)==-1) report("out of data!\n"); - if(oggpack_look(&r,tbit)!=(b[i]&mask[tbit])) + if((unsigned long)oggpack_look(&r,tbit)!=(b[i]&mask[tbit])) report("looked at incorrect value!\n"); if(tbit==1) - if(oggpack_look1(&r)!=(b[i]&mask[tbit])) + if((unsigned long)oggpack_look1(&r)!=(b[i]&mask[tbit])) report("looked at single bit incorrect value!\n"); if(tbit==1){ - if(oggpack_read1(&r)!=(b[i]&mask[tbit])) + if((unsigned long)oggpack_read1(&r)!=(b[i]&mask[tbit])) report("read incorrect single bit value!\n"); }else{ - if(oggpack_read(&r,tbit)!=(b[i]&mask[tbit])) - report("read incorrect value!\n"); + if((unsigned long)oggpack_read(&r,tbit)!=(b[i]&mask[tbit])) + report("read incorrect value!\n"); } } if(oggpack_bytes(&r)!=bytes)report("leftover bytes after read!\n"); @@ -600,16 +602,16 @@ int tbit=bits?bits:ilog(b[i]); if(oggpackB_look(&r,tbit)==-1) report("out of data!\n"); - if(oggpackB_look(&r,tbit)!=(b[i]&mask[tbit])) + if((unsigned long)oggpackB_look(&r,tbit)!=(b[i]&mask[tbit])) report("looked at incorrect value!\n"); if(tbit==1) - if(oggpackB_look1(&r)!=(b[i]&mask[tbit])) + if((unsigned long)oggpackB_look1(&r)!=(b[i]&mask[tbit])) report("looked at single bit incorrect value!\n"); if(tbit==1){ - if(oggpackB_read1(&r)!=(b[i]&mask[tbit])) + if((unsigned long)oggpackB_read1(&r)!=(b[i]&mask[tbit])) report("read incorrect single bit value!\n"); }else{ - if(oggpackB_read(&r,tbit)!=(b[i]&mask[tbit])) + if((unsigned long)oggpackB_read(&r,tbit)!=(b[i]&mask[tbit])) report("read incorrect value!\n"); } } @@ -888,7 +890,7 @@ oggpack_readinit(&r,buffer,bytes); for(i=0;i<test2size;i++){ if(oggpack_look(&r,32)==-1)report("out of data. failed!"); - if(oggpack_look(&r,32)!=large[i]){ + if((unsigned long)oggpack_look(&r,32)!=large[i]){ fprintf(stderr,"%ld != %lu (%lx!=%lx):",oggpack_look(&r,32),large[i], oggpack_look(&r,32),large[i]); report("read incorrect value!\n"); @@ -998,7 +1000,7 @@ oggpackB_readinit(&r,buffer,bytes); for(i=0;i<test2size;i++){ if(oggpackB_look(&r,32)==-1)report("out of data. failed!"); - if(oggpackB_look(&r,32)!=large[i]){ + if((unsigned long)oggpackB_look(&r,32)!=large[i]){ fprintf(stderr,"%ld != %lu (%lx!=%lx):",oggpackB_look(&r,32),large[i], oggpackB_look(&r,32),large[i]); report("read incorrect value!\n"); Modified: branches/OpenMPT-1.30/include/ogg/src/framing.c ============================================================================== --- branches/OpenMPT-1.30/include/ogg/src/framing.c Mon Jun 16 19:36:05 2025 (r23533) +++ branches/OpenMPT-1.30/include/ogg/src/framing.c Mon Jun 16 19:36:23 2025 (r23534) @@ -1107,19 +1107,26 @@ fprintf(stderr,")\n\n"); } -void copy_page(ogg_page *og){ +static int copy_page(ogg_page *og){ unsigned char *temp=_ogg_malloc(og->header_len); + if (!temp) + return -1; memcpy(temp,og->header,og->header_len); og->header=temp; temp=_ogg_malloc(og->body_len); + if (!temp) + return -1; memcpy(temp,og->body,og->body_len); og->body=temp; + return 0; } -void free_page(ogg_page *og){ +static void free_page(ogg_page *og){ _ogg_free (og->header); + og->header=NULL; _ogg_free (og->body); + og->body=NULL; } void error(void){ @@ -1502,6 +1509,11 @@ int byteskipcount=0; + if (!data) { + fprintf(stderr,"unable to allocate requried data buffer!\n"); + exit(1); + } + ogg_stream_reset(&os_en); ogg_stream_reset(&os_de); ogg_sync_reset(&oy); @@ -1813,6 +1825,11 @@ int inptr=0,i,j; ogg_page og[5]; + if (!data) { + fprintf(stderr,"unable to allocate requried packet data buffer!\n"); + exit(1); + } + ogg_stream_reset(&os_en); for(i=0;pl[i]!=-1;i++){ @@ -1836,7 +1853,10 @@ fprintf(stderr,"Too few pages output building sync tests!\n"); exit(1); } - copy_page(&og[i]); + if (-1 == copy_page(&og[i])) { + fprintf(stderr,"unable to copy page building sync tests!\n"); + exit(1); + } } /* Test lost pages on pagein/packetout: no rollback */ |
|
From: <sv...@op...> - 2025-06-16 17:36:12
|
Author: manx Date: Mon Jun 16 19:36:05 2025 New Revision: 23533 URL: https://source.openmpt.org/browse/openmpt/?op=revision&rev=23533 Log: Merged revision(s) 23531 from trunk/OpenMPT: [Var] ogg: Update to 1.3.6 (2025-06-16). ........ Modified: branches/OpenMPT-1.31/ (props changed) branches/OpenMPT-1.31/include/ogg/ (props changed) branches/OpenMPT-1.31/include/ogg/CHANGES branches/OpenMPT-1.31/include/ogg/OpenMPT.txt branches/OpenMPT-1.31/include/ogg/src/bitwise.c branches/OpenMPT-1.31/include/ogg/src/framing.c Modified: branches/OpenMPT-1.31/include/ogg/CHANGES ============================================================================== --- branches/OpenMPT-1.31/include/ogg/CHANGES Mon Jun 16 19:35:45 2025 (r23532) +++ branches/OpenMPT-1.31/include/ogg/CHANGES Mon Jun 16 19:36:05 2025 (r23533) @@ -1,3 +1,13 @@ +Version 1.3.6 (2025 June 16) + + * Update minimum cmake version to 3.6 + This fixes incompatibility with cmake >= 4.0 + * Fix UBsan issues + * Improve allocation failure handling + * Fix various compiler warnings + * Fix various autotool warnings + * Improve continuous integration testing scripts + Version 1.3.5 (2020 June 3) * Fix unsigned typedef problem on macOS. Modified: branches/OpenMPT-1.31/include/ogg/OpenMPT.txt ============================================================================== --- branches/OpenMPT-1.31/include/ogg/OpenMPT.txt Mon Jun 16 19:35:45 2025 (r23532) +++ branches/OpenMPT-1.31/include/ogg/OpenMPT.txt Mon Jun 16 19:36:05 2025 (r23533) @@ -1,9 +1,7 @@ -libogg library version 1.3.5 (2021-06-04). +libogg library version 1.3.6 (2025-06-16). The following changes have been made: * Obviously, unnecessary folders and files (documentation, makefiles, etc.) have been removed. - * The following commits have been applied: - * https://gitlab.xiph.org/xiph/ogg/-/commit/7cf42ea17aef7bc1b7b21af70724840a96c2e7d0 * ports/makefile/ogg/config_types.h has been added for plain Makefile builds. * win32/ogg.def has been modified to not override the linker library name. * For building, premake is used to generate Visual Studio project files. Modified: branches/OpenMPT-1.31/include/ogg/src/bitwise.c ============================================================================== --- branches/OpenMPT-1.31/include/ogg/src/bitwise.c Mon Jun 16 19:35:45 2025 (r23532) +++ branches/OpenMPT-1.31/include/ogg/src/bitwise.c Mon Jun 16 19:36:05 2025 (r23533) @@ -39,6 +39,8 @@ void oggpack_writeinit(oggpack_buffer *b){ memset(b,0,sizeof(*b)); b->ptr=b->buffer=_ogg_malloc(BUFFER_INCREMENT); + if (!b->buffer) + return; b->buffer[0]='\0'; b->storage=BUFFER_INCREMENT; } @@ -565,17 +567,17 @@ int tbit=bits?bits:ilog(b[i]); if(oggpack_look(&r,tbit)==-1) report("out of data!\n"); - if(oggpack_look(&r,tbit)!=(b[i]&mask[tbit])) + if((unsigned long)oggpack_look(&r,tbit)!=(b[i]&mask[tbit])) report("looked at incorrect value!\n"); if(tbit==1) - if(oggpack_look1(&r)!=(b[i]&mask[tbit])) + if((unsigned long)oggpack_look1(&r)!=(b[i]&mask[tbit])) report("looked at single bit incorrect value!\n"); if(tbit==1){ - if(oggpack_read1(&r)!=(b[i]&mask[tbit])) + if((unsigned long)oggpack_read1(&r)!=(b[i]&mask[tbit])) report("read incorrect single bit value!\n"); }else{ - if(oggpack_read(&r,tbit)!=(b[i]&mask[tbit])) - report("read incorrect value!\n"); + if((unsigned long)oggpack_read(&r,tbit)!=(b[i]&mask[tbit])) + report("read incorrect value!\n"); } } if(oggpack_bytes(&r)!=bytes)report("leftover bytes after read!\n"); @@ -600,16 +602,16 @@ int tbit=bits?bits:ilog(b[i]); if(oggpackB_look(&r,tbit)==-1) report("out of data!\n"); - if(oggpackB_look(&r,tbit)!=(b[i]&mask[tbit])) + if((unsigned long)oggpackB_look(&r,tbit)!=(b[i]&mask[tbit])) report("looked at incorrect value!\n"); if(tbit==1) - if(oggpackB_look1(&r)!=(b[i]&mask[tbit])) + if((unsigned long)oggpackB_look1(&r)!=(b[i]&mask[tbit])) report("looked at single bit incorrect value!\n"); if(tbit==1){ - if(oggpackB_read1(&r)!=(b[i]&mask[tbit])) + if((unsigned long)oggpackB_read1(&r)!=(b[i]&mask[tbit])) report("read incorrect single bit value!\n"); }else{ - if(oggpackB_read(&r,tbit)!=(b[i]&mask[tbit])) + if((unsigned long)oggpackB_read(&r,tbit)!=(b[i]&mask[tbit])) report("read incorrect value!\n"); } } @@ -888,7 +890,7 @@ oggpack_readinit(&r,buffer,bytes); for(i=0;i<test2size;i++){ if(oggpack_look(&r,32)==-1)report("out of data. failed!"); - if(oggpack_look(&r,32)!=large[i]){ + if((unsigned long)oggpack_look(&r,32)!=large[i]){ fprintf(stderr,"%ld != %lu (%lx!=%lx):",oggpack_look(&r,32),large[i], oggpack_look(&r,32),large[i]); report("read incorrect value!\n"); @@ -998,7 +1000,7 @@ oggpackB_readinit(&r,buffer,bytes); for(i=0;i<test2size;i++){ if(oggpackB_look(&r,32)==-1)report("out of data. failed!"); - if(oggpackB_look(&r,32)!=large[i]){ + if((unsigned long)oggpackB_look(&r,32)!=large[i]){ fprintf(stderr,"%ld != %lu (%lx!=%lx):",oggpackB_look(&r,32),large[i], oggpackB_look(&r,32),large[i]); report("read incorrect value!\n"); Modified: branches/OpenMPT-1.31/include/ogg/src/framing.c ============================================================================== --- branches/OpenMPT-1.31/include/ogg/src/framing.c Mon Jun 16 19:35:45 2025 (r23532) +++ branches/OpenMPT-1.31/include/ogg/src/framing.c Mon Jun 16 19:36:05 2025 (r23533) @@ -1107,19 +1107,26 @@ fprintf(stderr,")\n\n"); } -void copy_page(ogg_page *og){ +static int copy_page(ogg_page *og){ unsigned char *temp=_ogg_malloc(og->header_len); + if (!temp) + return -1; memcpy(temp,og->header,og->header_len); og->header=temp; temp=_ogg_malloc(og->body_len); + if (!temp) + return -1; memcpy(temp,og->body,og->body_len); og->body=temp; + return 0; } -void free_page(ogg_page *og){ +static void free_page(ogg_page *og){ _ogg_free (og->header); + og->header=NULL; _ogg_free (og->body); + og->body=NULL; } void error(void){ @@ -1502,6 +1509,11 @@ int byteskipcount=0; + if (!data) { + fprintf(stderr,"unable to allocate requried data buffer!\n"); + exit(1); + } + ogg_stream_reset(&os_en); ogg_stream_reset(&os_de); ogg_sync_reset(&oy); @@ -1813,6 +1825,11 @@ int inptr=0,i,j; ogg_page og[5]; + if (!data) { + fprintf(stderr,"unable to allocate requried packet data buffer!\n"); + exit(1); + } + ogg_stream_reset(&os_en); for(i=0;pl[i]!=-1;i++){ @@ -1836,7 +1853,10 @@ fprintf(stderr,"Too few pages output building sync tests!\n"); exit(1); } - copy_page(&og[i]); + if (-1 == copy_page(&og[i])) { + fprintf(stderr,"unable to copy page building sync tests!\n"); + exit(1); + } } /* Test lost pages on pagein/packetout: no rollback */ |
|
From: <sv...@op...> - 2025-06-16 17:35:57
|
Author: manx Date: Mon Jun 16 19:35:45 2025 New Revision: 23532 URL: https://source.openmpt.org/browse/openmpt/?op=revision&rev=23532 Log: Merged revision(s) 23531 from trunk/OpenMPT: [Var] ogg: Update to 1.3.6 (2025-06-16). ........ Modified: branches/OpenMPT-1.32/ (props changed) branches/OpenMPT-1.32/include/ogg/ (props changed) branches/OpenMPT-1.32/include/ogg/CHANGES branches/OpenMPT-1.32/include/ogg/OpenMPT.txt branches/OpenMPT-1.32/include/ogg/src/bitwise.c branches/OpenMPT-1.32/include/ogg/src/framing.c Modified: branches/OpenMPT-1.32/include/ogg/CHANGES ============================================================================== --- branches/OpenMPT-1.32/include/ogg/CHANGES Mon Jun 16 19:35:04 2025 (r23531) +++ branches/OpenMPT-1.32/include/ogg/CHANGES Mon Jun 16 19:35:45 2025 (r23532) @@ -1,3 +1,13 @@ +Version 1.3.6 (2025 June 16) + + * Update minimum cmake version to 3.6 + This fixes incompatibility with cmake >= 4.0 + * Fix UBsan issues + * Improve allocation failure handling + * Fix various compiler warnings + * Fix various autotool warnings + * Improve continuous integration testing scripts + Version 1.3.5 (2020 June 3) * Fix unsigned typedef problem on macOS. Modified: branches/OpenMPT-1.32/include/ogg/OpenMPT.txt ============================================================================== --- branches/OpenMPT-1.32/include/ogg/OpenMPT.txt Mon Jun 16 19:35:04 2025 (r23531) +++ branches/OpenMPT-1.32/include/ogg/OpenMPT.txt Mon Jun 16 19:35:45 2025 (r23532) @@ -1,9 +1,7 @@ -libogg library version 1.3.5 (2021-06-04). +libogg library version 1.3.6 (2025-06-16). The following changes have been made: * Obviously, unnecessary folders and files (documentation, makefiles, etc.) have been removed. - * The following commits have been applied: - * https://gitlab.xiph.org/xiph/ogg/-/commit/7cf42ea17aef7bc1b7b21af70724840a96c2e7d0 * ports/makefile/ogg/config_types.h has been added for plain Makefile builds. * win32/ogg.def has been modified to not override the linker library name. * For building, premake is used to generate Visual Studio project files. Modified: branches/OpenMPT-1.32/include/ogg/src/bitwise.c ============================================================================== --- branches/OpenMPT-1.32/include/ogg/src/bitwise.c Mon Jun 16 19:35:04 2025 (r23531) +++ branches/OpenMPT-1.32/include/ogg/src/bitwise.c Mon Jun 16 19:35:45 2025 (r23532) @@ -39,6 +39,8 @@ void oggpack_writeinit(oggpack_buffer *b){ memset(b,0,sizeof(*b)); b->ptr=b->buffer=_ogg_malloc(BUFFER_INCREMENT); + if (!b->buffer) + return; b->buffer[0]='\0'; b->storage=BUFFER_INCREMENT; } @@ -565,17 +567,17 @@ int tbit=bits?bits:ilog(b[i]); if(oggpack_look(&r,tbit)==-1) report("out of data!\n"); - if(oggpack_look(&r,tbit)!=(b[i]&mask[tbit])) + if((unsigned long)oggpack_look(&r,tbit)!=(b[i]&mask[tbit])) report("looked at incorrect value!\n"); if(tbit==1) - if(oggpack_look1(&r)!=(b[i]&mask[tbit])) + if((unsigned long)oggpack_look1(&r)!=(b[i]&mask[tbit])) report("looked at single bit incorrect value!\n"); if(tbit==1){ - if(oggpack_read1(&r)!=(b[i]&mask[tbit])) + if((unsigned long)oggpack_read1(&r)!=(b[i]&mask[tbit])) report("read incorrect single bit value!\n"); }else{ - if(oggpack_read(&r,tbit)!=(b[i]&mask[tbit])) - report("read incorrect value!\n"); + if((unsigned long)oggpack_read(&r,tbit)!=(b[i]&mask[tbit])) + report("read incorrect value!\n"); } } if(oggpack_bytes(&r)!=bytes)report("leftover bytes after read!\n"); @@ -600,16 +602,16 @@ int tbit=bits?bits:ilog(b[i]); if(oggpackB_look(&r,tbit)==-1) report("out of data!\n"); - if(oggpackB_look(&r,tbit)!=(b[i]&mask[tbit])) + if((unsigned long)oggpackB_look(&r,tbit)!=(b[i]&mask[tbit])) report("looked at incorrect value!\n"); if(tbit==1) - if(oggpackB_look1(&r)!=(b[i]&mask[tbit])) + if((unsigned long)oggpackB_look1(&r)!=(b[i]&mask[tbit])) report("looked at single bit incorrect value!\n"); if(tbit==1){ - if(oggpackB_read1(&r)!=(b[i]&mask[tbit])) + if((unsigned long)oggpackB_read1(&r)!=(b[i]&mask[tbit])) report("read incorrect single bit value!\n"); }else{ - if(oggpackB_read(&r,tbit)!=(b[i]&mask[tbit])) + if((unsigned long)oggpackB_read(&r,tbit)!=(b[i]&mask[tbit])) report("read incorrect value!\n"); } } @@ -888,7 +890,7 @@ oggpack_readinit(&r,buffer,bytes); for(i=0;i<test2size;i++){ if(oggpack_look(&r,32)==-1)report("out of data. failed!"); - if(oggpack_look(&r,32)!=large[i]){ + if((unsigned long)oggpack_look(&r,32)!=large[i]){ fprintf(stderr,"%ld != %lu (%lx!=%lx):",oggpack_look(&r,32),large[i], oggpack_look(&r,32),large[i]); report("read incorrect value!\n"); @@ -998,7 +1000,7 @@ oggpackB_readinit(&r,buffer,bytes); for(i=0;i<test2size;i++){ if(oggpackB_look(&r,32)==-1)report("out of data. failed!"); - if(oggpackB_look(&r,32)!=large[i]){ + if((unsigned long)oggpackB_look(&r,32)!=large[i]){ fprintf(stderr,"%ld != %lu (%lx!=%lx):",oggpackB_look(&r,32),large[i], oggpackB_look(&r,32),large[i]); report("read incorrect value!\n"); Modified: branches/OpenMPT-1.32/include/ogg/src/framing.c ============================================================================== --- branches/OpenMPT-1.32/include/ogg/src/framing.c Mon Jun 16 19:35:04 2025 (r23531) +++ branches/OpenMPT-1.32/include/ogg/src/framing.c Mon Jun 16 19:35:45 2025 (r23532) @@ -1107,19 +1107,26 @@ fprintf(stderr,")\n\n"); } -void copy_page(ogg_page *og){ +static int copy_page(ogg_page *og){ unsigned char *temp=_ogg_malloc(og->header_len); + if (!temp) + return -1; memcpy(temp,og->header,og->header_len); og->header=temp; temp=_ogg_malloc(og->body_len); + if (!temp) + return -1; memcpy(temp,og->body,og->body_len); og->body=temp; + return 0; } -void free_page(ogg_page *og){ +static void free_page(ogg_page *og){ _ogg_free (og->header); + og->header=NULL; _ogg_free (og->body); + og->body=NULL; } void error(void){ @@ -1502,6 +1509,11 @@ int byteskipcount=0; + if (!data) { + fprintf(stderr,"unable to allocate requried data buffer!\n"); + exit(1); + } + ogg_stream_reset(&os_en); ogg_stream_reset(&os_de); ogg_sync_reset(&oy); @@ -1813,6 +1825,11 @@ int inptr=0,i,j; ogg_page og[5]; + if (!data) { + fprintf(stderr,"unable to allocate requried packet data buffer!\n"); + exit(1); + } + ogg_stream_reset(&os_en); for(i=0;pl[i]!=-1;i++){ @@ -1836,7 +1853,10 @@ fprintf(stderr,"Too few pages output building sync tests!\n"); exit(1); } - copy_page(&og[i]); + if (-1 == copy_page(&og[i])) { + fprintf(stderr,"unable to copy page building sync tests!\n"); + exit(1); + } } /* Test lost pages on pagein/packetout: no rollback */ |
|
From: <sv...@op...> - 2025-06-16 17:35:16
|
Author: manx Date: Mon Jun 16 19:35:04 2025 New Revision: 23531 URL: https://source.openmpt.org/browse/openmpt/?op=revision&rev=23531 Log: [Var] ogg: Update to 1.3.6 (2025-06-16). Modified: trunk/OpenMPT/include/ogg/ (props changed) trunk/OpenMPT/include/ogg/CHANGES trunk/OpenMPT/include/ogg/OpenMPT.txt trunk/OpenMPT/include/ogg/src/bitwise.c trunk/OpenMPT/include/ogg/src/framing.c Modified: trunk/OpenMPT/include/ogg/CHANGES ============================================================================== --- trunk/OpenMPT/include/ogg/CHANGES Mon Jun 16 16:27:34 2025 (r23530) +++ trunk/OpenMPT/include/ogg/CHANGES Mon Jun 16 19:35:04 2025 (r23531) @@ -1,3 +1,13 @@ +Version 1.3.6 (2025 June 16) + + * Update minimum cmake version to 3.6 + This fixes incompatibility with cmake >= 4.0 + * Fix UBsan issues + * Improve allocation failure handling + * Fix various compiler warnings + * Fix various autotool warnings + * Improve continuous integration testing scripts + Version 1.3.5 (2020 June 3) * Fix unsigned typedef problem on macOS. Modified: trunk/OpenMPT/include/ogg/OpenMPT.txt ============================================================================== --- trunk/OpenMPT/include/ogg/OpenMPT.txt Mon Jun 16 16:27:34 2025 (r23530) +++ trunk/OpenMPT/include/ogg/OpenMPT.txt Mon Jun 16 19:35:04 2025 (r23531) @@ -1,9 +1,7 @@ -libogg library version 1.3.5 (2021-06-04). +libogg library version 1.3.6 (2025-06-16). The following changes have been made: * Obviously, unnecessary folders and files (documentation, makefiles, etc.) have been removed. - * The following commits have been applied: - * https://gitlab.xiph.org/xiph/ogg/-/commit/7cf42ea17aef7bc1b7b21af70724840a96c2e7d0 * ports/makefile/ogg/config_types.h has been added for plain Makefile builds. * win32/ogg.def has been modified to not override the linker library name. * For building, premake is used to generate Visual Studio project files. Modified: trunk/OpenMPT/include/ogg/src/bitwise.c ============================================================================== --- trunk/OpenMPT/include/ogg/src/bitwise.c Mon Jun 16 16:27:34 2025 (r23530) +++ trunk/OpenMPT/include/ogg/src/bitwise.c Mon Jun 16 19:35:04 2025 (r23531) @@ -39,6 +39,8 @@ void oggpack_writeinit(oggpack_buffer *b){ memset(b,0,sizeof(*b)); b->ptr=b->buffer=_ogg_malloc(BUFFER_INCREMENT); + if (!b->buffer) + return; b->buffer[0]='\0'; b->storage=BUFFER_INCREMENT; } @@ -565,17 +567,17 @@ int tbit=bits?bits:ilog(b[i]); if(oggpack_look(&r,tbit)==-1) report("out of data!\n"); - if(oggpack_look(&r,tbit)!=(b[i]&mask[tbit])) + if((unsigned long)oggpack_look(&r,tbit)!=(b[i]&mask[tbit])) report("looked at incorrect value!\n"); if(tbit==1) - if(oggpack_look1(&r)!=(b[i]&mask[tbit])) + if((unsigned long)oggpack_look1(&r)!=(b[i]&mask[tbit])) report("looked at single bit incorrect value!\n"); if(tbit==1){ - if(oggpack_read1(&r)!=(b[i]&mask[tbit])) + if((unsigned long)oggpack_read1(&r)!=(b[i]&mask[tbit])) report("read incorrect single bit value!\n"); }else{ - if(oggpack_read(&r,tbit)!=(b[i]&mask[tbit])) - report("read incorrect value!\n"); + if((unsigned long)oggpack_read(&r,tbit)!=(b[i]&mask[tbit])) + report("read incorrect value!\n"); } } if(oggpack_bytes(&r)!=bytes)report("leftover bytes after read!\n"); @@ -600,16 +602,16 @@ int tbit=bits?bits:ilog(b[i]); if(oggpackB_look(&r,tbit)==-1) report("out of data!\n"); - if(oggpackB_look(&r,tbit)!=(b[i]&mask[tbit])) + if((unsigned long)oggpackB_look(&r,tbit)!=(b[i]&mask[tbit])) report("looked at incorrect value!\n"); if(tbit==1) - if(oggpackB_look1(&r)!=(b[i]&mask[tbit])) + if((unsigned long)oggpackB_look1(&r)!=(b[i]&mask[tbit])) report("looked at single bit incorrect value!\n"); if(tbit==1){ - if(oggpackB_read1(&r)!=(b[i]&mask[tbit])) + if((unsigned long)oggpackB_read1(&r)!=(b[i]&mask[tbit])) report("read incorrect single bit value!\n"); }else{ - if(oggpackB_read(&r,tbit)!=(b[i]&mask[tbit])) + if((unsigned long)oggpackB_read(&r,tbit)!=(b[i]&mask[tbit])) report("read incorrect value!\n"); } } @@ -888,7 +890,7 @@ oggpack_readinit(&r,buffer,bytes); for(i=0;i<test2size;i++){ if(oggpack_look(&r,32)==-1)report("out of data. failed!"); - if(oggpack_look(&r,32)!=large[i]){ + if((unsigned long)oggpack_look(&r,32)!=large[i]){ fprintf(stderr,"%ld != %lu (%lx!=%lx):",oggpack_look(&r,32),large[i], oggpack_look(&r,32),large[i]); report("read incorrect value!\n"); @@ -998,7 +1000,7 @@ oggpackB_readinit(&r,buffer,bytes); for(i=0;i<test2size;i++){ if(oggpackB_look(&r,32)==-1)report("out of data. failed!"); - if(oggpackB_look(&r,32)!=large[i]){ + if((unsigned long)oggpackB_look(&r,32)!=large[i]){ fprintf(stderr,"%ld != %lu (%lx!=%lx):",oggpackB_look(&r,32),large[i], oggpackB_look(&r,32),large[i]); report("read incorrect value!\n"); Modified: trunk/OpenMPT/include/ogg/src/framing.c ============================================================================== --- trunk/OpenMPT/include/ogg/src/framing.c Mon Jun 16 16:27:34 2025 (r23530) +++ trunk/OpenMPT/include/ogg/src/framing.c Mon Jun 16 19:35:04 2025 (r23531) @@ -1107,19 +1107,26 @@ fprintf(stderr,")\n\n"); } -void copy_page(ogg_page *og){ +static int copy_page(ogg_page *og){ unsigned char *temp=_ogg_malloc(og->header_len); + if (!temp) + return -1; memcpy(temp,og->header,og->header_len); og->header=temp; temp=_ogg_malloc(og->body_len); + if (!temp) + return -1; memcpy(temp,og->body,og->body_len); og->body=temp; + return 0; } -void free_page(ogg_page *og){ +static void free_page(ogg_page *og){ _ogg_free (og->header); + og->header=NULL; _ogg_free (og->body); + og->body=NULL; } void error(void){ @@ -1502,6 +1509,11 @@ int byteskipcount=0; + if (!data) { + fprintf(stderr,"unable to allocate requried data buffer!\n"); + exit(1); + } + ogg_stream_reset(&os_en); ogg_stream_reset(&os_de); ogg_sync_reset(&oy); @@ -1813,6 +1825,11 @@ int inptr=0,i,j; ogg_page og[5]; + if (!data) { + fprintf(stderr,"unable to allocate requried packet data buffer!\n"); + exit(1); + } + ogg_stream_reset(&os_en); for(i=0;pl[i]!=-1;i++){ @@ -1836,7 +1853,10 @@ fprintf(stderr,"Too few pages output building sync tests!\n"); exit(1); } - copy_page(&og[i]); + if (-1 == copy_page(&og[i])) { + fprintf(stderr,"unable to copy page building sync tests!\n"); + exit(1); + } } /* Test lost pages on pagein/packetout: no rollback */ |
|
From: <sv...@op...> - 2025-06-16 14:27:46
|
Author: manx Date: Mon Jun 16 16:27:34 2025 New Revision: 23530 URL: https://source.openmpt.org/browse/openmpt/?op=revision&rev=23530 Log: Merged revision(s) 23529 from trunk/OpenMPT: [Fix] mpt/fs/common_directories.hpp: GetModuleFileName() can return set GetLastError() to ERROR_SUCCESS when truncating the returned string on Windows XP and earlier. ........ Modified: branches/OpenMPT-1.32/ (props changed) branches/OpenMPT-1.32/src/mpt/fs/common_directories.hpp Modified: branches/OpenMPT-1.32/src/mpt/fs/common_directories.hpp ============================================================================== --- branches/OpenMPT-1.32/src/mpt/fs/common_directories.hpp Mon Jun 16 16:27:14 2025 (r23529) +++ branches/OpenMPT-1.32/src/mpt/fs/common_directories.hpp Mon Jun 16 16:27:34 2025 (r23530) @@ -39,9 +39,18 @@ static inline mpt::native_path get_application_directory() { std::vector<TCHAR> exeFileName(MAX_PATH); while (::GetModuleFileName(0, exeFileName.data(), mpt::saturate_cast<DWORD>(exeFileName.size())) >= exeFileName.size()) { +#if MPT_WIN_AT_LEAST(MPT_WIN_VISTA) if (::GetLastError() != ERROR_INSUFFICIENT_BUFFER) { return mpt::native_path(); } +#else + // Windows XP and earlier return ERROR_SUCCESS even when the string does not fit. + // See <https://learn.microsoft.com/en-us/windows/win32/api/libloaderapi/nf-libloaderapi-getmodulefilenamea>. + DWORD errc = ::GetLastError(); + if ((errc != ERROR_INSUFFICIENT_BUFFER) && (errc != ERROR_SUCCESS)) { + return mpt::native_path(); + } +#endif exeFileName.resize(exeFileName.size() * 2); } return mpt::native_fs{}.absolute(mpt::native_path::FromNative(exeFileName.data()).GetDirectoryWithDrive()); |
|
From: <sv...@op...> - 2025-06-16 14:27:26
|
Author: manx Date: Mon Jun 16 16:27:14 2025 New Revision: 23529 URL: https://source.openmpt.org/browse/openmpt/?op=revision&rev=23529 Log: [Fix] mpt/fs/common_directories.hpp: GetModuleFileName() can return set GetLastError() to ERROR_SUCCESS when truncating the returned string on Windows XP and earlier. Modified: trunk/OpenMPT/src/mpt/fs/common_directories.hpp Modified: trunk/OpenMPT/src/mpt/fs/common_directories.hpp ============================================================================== --- trunk/OpenMPT/src/mpt/fs/common_directories.hpp Sun Jun 15 22:34:39 2025 (r23528) +++ trunk/OpenMPT/src/mpt/fs/common_directories.hpp Mon Jun 16 16:27:14 2025 (r23529) @@ -39,9 +39,18 @@ static inline mpt::native_path get_application_directory() { std::vector<TCHAR> exeFileName(MAX_PATH); while (::GetModuleFileName(0, exeFileName.data(), mpt::saturate_cast<DWORD>(exeFileName.size())) >= exeFileName.size()) { +#if MPT_WIN_AT_LEAST(MPT_WIN_VISTA) if (::GetLastError() != ERROR_INSUFFICIENT_BUFFER) { return mpt::native_path(); } +#else + // Windows XP and earlier return ERROR_SUCCESS even when the string does not fit. + // See <https://learn.microsoft.com/en-us/windows/win32/api/libloaderapi/nf-libloaderapi-getmodulefilenamea>. + DWORD errc = ::GetLastError(); + if ((errc != ERROR_INSUFFICIENT_BUFFER) && (errc != ERROR_SUCCESS)) { + return mpt::native_path(); + } +#endif exeFileName.resize(exeFileName.size() * 2); } return mpt::native_fs{}.absolute(mpt::native_path::FromNative(exeFileName.data()).GetDirectoryWithDrive()); |
3 messages has been excluded from this view by a project administrator.
