Be sure to check the availability of code entries before accessing them.

[cc65] / src / cc65 / coptptrload.c

diff --git a/src/cc65/coptptrload.c b/src/cc65/coptptrload.c
index 1e4b152d5e5d0cd7e1baca829b2467c4e9d388f6..78905d8d58ccad9d32cbe43fcb4f91ae58afaf67 100644 (file)
--- a/src/cc65/coptptrload.c
+++ b/src/cc65/coptptrload.c
@@ -1247,16 +1247,14 @@ unsigned OptPtrLoad15 (CodeSeg* S)
 
     /* Walk over the entries */
     unsigned I = 0;
-    while (I < CS_GetEntryCount (S) - 3) {
+    while (I < CS_GetEntryCount (S)) {
 
        CodeEntry* L[5];
        unsigned Len;
 
-       /* Get next 3 entries */
-               CS_GetEntries (S, L, I, 3);
-
        /* Check for the start of the sequence */
-               if (L[0]->OPC == OP65_LDA && L[0]->AM == AM65_ZP        &&
+               if (CS_GetEntries (S, L, I, 3)                          &&
+            L[0]->OPC == OP65_LDA && L[0]->AM == AM65_ZP        &&
                    L[1]->OPC == OP65_LDX && L[1]->AM == AM65_ZP        &&
             !CS_RangeHasLabel (S, I+1, 2)                       &&
             (Len = strlen (L[0]->Arg)) > 0                      &&