Created
January 31, 2015 05:02
-
-
Save dstogov/63b269207ba0aed8b776 to your computer and use it in GitHub Desktop.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
diff --git a/Zend/zend_vm_def.h b/Zend/zend_vm_def.h | |
index 80f7ef3..eb30818 100644 | |
--- a/Zend/zend_vm_def.h | |
+++ b/Zend/zend_vm_def.h | |
@@ -4692,7 +4692,6 @@ ZEND_VM_HANDLER(77, ZEND_FE_RESET_R, CONST|TMP|VAR|CV, ANY) | |
} | |
pos++; | |
} | |
- fe_ht->nInternalPointer = pos; | |
Z_FE_ITER_P(EX_VAR(opline->result.var)) = zend_hash_iterator_add(fe_ht, pos); | |
FREE_OP1_IF_VAR(); | |
@@ -4803,7 +4802,6 @@ ZEND_VM_HANDLER(125, ZEND_FE_RESET_RW, CONST|TMP|VAR|CV, ANY) | |
} | |
pos++; | |
} | |
- fe_ht->nInternalPointer = pos; | |
Z_FE_ITER_P(EX_VAR(opline->result.var)) = zend_hash_iterator_add(fe_ht, pos); | |
FREE_OP1_VAR_PTR(); | |
@@ -4839,7 +4837,6 @@ ZEND_VM_HANDLER(125, ZEND_FE_RESET_RW, CONST|TMP|VAR|CV, ANY) | |
} | |
pos++; | |
} | |
- fe_ht->nInternalPointer = pos; | |
Z_FE_ITER_P(EX_VAR(opline->result.var)) = zend_hash_iterator_add(fe_ht, pos); | |
FREE_OP1_VAR_PTR(); | |
@@ -5026,8 +5023,7 @@ ZEND_VM_HANDLER(78, ZEND_FE_FETCH_R, VAR, ANY) | |
break; | |
} | |
} | |
- EG(ht_iterators)[Z_FE_ITER_P(EX_VAR(opline->op1.var))].pos = | |
- fe_ht->nInternalPointer = pos; | |
+ EG(ht_iterators)[Z_FE_ITER_P(EX_VAR(opline->op1.var))].pos = pos; | |
ZEND_VM_INC_OPCODE(); | |
ZEND_VM_NEXT_OPCODE(); | |
} else { | |
@@ -5100,7 +5096,6 @@ ZEND_VM_HANDLER(126, ZEND_FE_FETCH_RW, VAR, ANY) | |
while (1) { | |
if (UNEXPECTED(pos >= fe_ht->nNumUsed)) { | |
/* reached end of iteration */ | |
- fe_ht->nInternalPointer = INVALID_IDX; | |
ZEND_VM_JMP(OP_JMP_ADDR(opline, opline->op2)); | |
} | |
p = fe_ht->arData + pos; | |
@@ -5140,8 +5135,7 @@ ZEND_VM_HANDLER(126, ZEND_FE_FETCH_RW, VAR, ANY) | |
break; | |
} | |
} | |
- EG(ht_iterators)[Z_FE_ITER_P(EX_VAR(opline->op1.var))].pos = | |
- fe_ht->nInternalPointer = pos; | |
+ EG(ht_iterators)[Z_FE_ITER_P(EX_VAR(opline->op1.var))].pos = pos; | |
ZEND_VM_INC_OPCODE(); | |
ZEND_VM_NEXT_OPCODE(); | |
} else if (EXPECTED(Z_TYPE_P(array) == IS_OBJECT)) { | |
@@ -5156,7 +5150,6 @@ ZEND_VM_HANDLER(126, ZEND_FE_FETCH_RW, VAR, ANY) | |
while (1) { | |
if (UNEXPECTED(pos >= fe_ht->nNumUsed)) { | |
/* reached end of iteration */ | |
- fe_ht->nInternalPointer = INVALID_IDX; | |
ZEND_VM_JMP(OP_JMP_ADDR(opline, opline->op2)); | |
} | |
@@ -5210,8 +5203,7 @@ ZEND_VM_HANDLER(126, ZEND_FE_FETCH_RW, VAR, ANY) | |
break; | |
} | |
} | |
- EG(ht_iterators)[Z_FE_ITER_P(EX_VAR(opline->op1.var))].pos = | |
- fe_ht->nInternalPointer = pos; | |
+ EG(ht_iterators)[Z_FE_ITER_P(EX_VAR(opline->op1.var))].pos = pos; | |
ZEND_VM_INC_OPCODE(); | |
ZEND_VM_NEXT_OPCODE(); | |
} else { |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment