Changeset d160dda in buchla-emu

Timestamp:

09/07/2017 03:34:47 PM (7 years ago)

Author:

Alexander Heinrich <alex.heinrich@…>

Branches:

master

Children:

a86b3ab

Parents:

c9d372a

Message:

Move check if cursor in bounds to lcd_write

File:

• emu/lcd.c (modified) (3 diffs)

emu/lcd.c

@@ -299 +299 @@
                 default:
                         rv = 0x00;
-                        err("Invalid cur value %d in lcd_read", cur);
                         break;
         }
@@ -354 +353 @@
                                                 }
                                         }
-                                        else {
-                                                err("Invalid cur value %d in lcd_write", cur);
-                                        }
                                 break;
 
@@ -366 +362 @@
                                 else if (cur_c == 1) {
                                         cur = cur | ((int32_t) val << 8);
+                                        if (cur < BASE_TXT || (cur >= BASE_TXT + TXT_W * TXT_H && cur < BASE_GFX) || cur >= BASE_GFX + GFX_W * GFX_H) {
+                                                err("Invalid cur value %d", cur);
+                                        }
                                         cur_c = 0;
                                 }