[Scummvm-devel] Re: [Scummvm-cvs-logs] CVS: scummvm/scumm sound.cpp,1.176,1.177

J.Brown (Ender) ender at scummvm.org
Sat Jul 19 00:06:04 CEST 2003


Now, this is the type of fix that shoul probably NOT be commited during a
freeze!

Are we sure that this is never ever triggered anywhere in Zak256?
This somewhat negates all the testing we have done to Zak up until this
point, as it could potentially now cause a frozen considered 'stable' game
from being completable.

Whilst I agree that it is probably better to error() in this situation
this should NOT have been commited without further discussion.

Can I please get a guarantee this error  cannot possibly occur anywhere in
Zak256? Otherwise please revert it ASAP.

We will be branching on Monday/Tuesday, and this should probably be
reverted until then.

 - Ender

   http://www.scummvm.org/   | "Amen! Attempts to eradicate humour from
   http://www.quakesrc.org/  |  our distribution should be ignored with
   http://www.enderboi.com/  |  extreme prejudice" - cjwatson at debian.org

On Fri, 18 Jul 2003, Travis Howell wrote:

> Date: Fri, 18 Jul 2003 21:32:37 -0700
> From: Travis Howell <kirben at users.sourceforge.net>
> To: scummvm-cvs-logs at lists.sourceforge.net
> Subject: [Scummvm-cvs-logs] CVS: scummvm/scumm sound.cpp,1.176,1.177
>
> Update of /cvsroot/scummvm/scummvm/scumm
> In directory sc8-pr-cvs1:/tmp/cvs-serv22860
>
> Modified Files:
> 	sound.cpp
> Log Message:
>
> Another fix from Hibernatus
>
>
>
> Index: sound.cpp
> ===================================================================
> RCS file: /cvsroot/scummvm/scummvm/scumm/sound.cpp,v
> retrieving revision 1.176
> retrieving revision 1.177
> diff -u -d -r1.176 -r1.177
> --- sound.cpp	19 Jul 2003 03:54:33 -0000	1.176
> +++ sound.cpp	19 Jul 2003 04:32:35 -0000	1.177
> @@ -402,8 +402,8 @@
>  						ptr += 0x20;
>  						size -= 0x20;
>  						if (size < waveSize) {
> -							warning("Wrong wave size in sound #%i: %i", soundID, waveSize);
> -							waveSize = size - 0x36;
> +							error("Wrong wave size in sound #%i: %i", soundID, waveSize);
> +							return;
>  						}
>  						sound = (char *)malloc(waveSize);
>  						for (int x = 0; x < waveSize; x++) {
>
>
>
> -------------------------------------------------------
> This SF.net email is sponsored by: VM Ware
> With VMware you can run multiple operating systems on a single machine.
> WITHOUT REBOOTING! Mix Linux / Windows / Novell virtual machines at the
> same time. Free trial click here: http://www.vmware.com/wl/offer/345/0
> _______________________________________________
> Scummvm-cvs-logs mailing list
> Scummvm-cvs-logs at lists.sourceforge.net
> https://lists.sourceforge.net/lists/listinfo/scummvm-cvs-logs
>





More information about the Scummvm-devel mailing list