Um, having lunch has created a better patch IMO.
It removes the "if (assignment_and_test)" line
and still fixes the Oops.

Please apply this one instead if possible...
to 2.4.7-preX and 2.3.6-acN.

Thanks.
-- 
~Randy