cabinet: Fix the regression caused by 4046075462c00f4479f185d1c0514584ff851223

[Andrew Talbot]

Dmitry Timoshkov wrote:

> Hello,
> 
> this patch fixes the regression leading to a corrupted Adobe Photoshop
> installations. The regression is caused by
> 
> 4046075462c00f4479f185d1c0514584ff851223 is first bad commit
> commit 4046075462c00f4479f185d1c0514584ff851223
> Author: Andrew Talbot <andrew.talbot at talbotville.com>
> Date:   Tue May 13 22:41:58 2008 +0100
> 
>     cabinet: Remove order-of-evaluation dependencies.
> 
> in particular by this change:
> 
> -        n -= (e = (e = ZIPWSIZE - ((d &= ZIPWSIZE-1) > w ? d : w)) > n
> ?n:e);
> +        d = max(d & (ZIPWSIZE - 1), w);
> +        e = min(ZIPWSIZE - d, n);
> +        n -= e;

Thanks, Dmitry, for kindly straightening this one. Much appreciated!

-- 
Andy.