[asperl] integrate latest win32 branch

p4raw-id: //depot/asperl@569

1 files changed, 2 insertions, 0 deletions

diff --git a/op.c b/op.c
index fae24f82ca..c0b1124d30 100644
--- a/op.c
+++ b/op.c
@@ -4830,6 +4830,8 @@ peep(register OP *o)
 	case OP_AND:
 	case OP_OR:
 	    o->op_seq = op_seqmax++;
+	    while (cLOGOP->op_other->op_type == OP_NULL)
+		cLOGOP->op_other = cLOGOP->op_other->op_next;
 	    peep(cLOGOP->op_other);
 	    break;