kernel: fix bounds check in screenputc()

diff --git a/sys/src/9/bcm/screen.c b/sys/src/9/bcm/screen.c
index a892a811d5d43eee021b4ebbb468e4efca3a25db..fc0076b7886a798165dc3d985f448f552aafbd6e 100644 (file)
--- a/sys/src/9/bcm/screen.c
+++ b/sys/src/9/bcm/screen.c
@@ -303,7 +303,7 @@ screenputc(char *buf)
        static int *xp;
        static int xbuf[256];
 
-       if (xp < xbuf || xp >= &xbuf[sizeof(xbuf)])
+       if (xp < xbuf || xp >= &xbuf[nelem(xbuf)])
                xp = xbuf;
 
        switch (buf[0]) {

diff --git a/sys/src/9/omap/screen.c b/sys/src/9/omap/screen.c
index fe122e4eb3633861d328708987a239979a67d5d3..bc4a64b809bc94dbb91cad4cdf1793ce66d53b5c 100644 (file)
--- a/sys/src/9/omap/screen.c
+++ b/sys/src/9/omap/screen.c
@@ -576,7 +576,7 @@ screenputc(char *buf)
        static int *xp;
        static int xbuf[256];
 
-       if (xp < xbuf || xp >= &xbuf[sizeof(xbuf)])
+       if (xp < xbuf || xp >= &xbuf[nelem(xbuf)])
                xp = xbuf;
 
        switch (buf[0]) {

diff --git a/sys/src/9/pc/vga.c b/sys/src/9/pc/vga.c
index 6969f9e3cb3c21162162dac4edc32a34200a2440..fe903f0a0cf398baad63f5a1d5c5bebc8b2191aa 100644 (file)
--- a/sys/src/9/pc/vga.c
+++ b/sys/src/9/pc/vga.c
@@ -53,7 +53,7 @@ vgascreenputc(VGAscr* scr, char* buf, Rectangle *flushr)
        int h, w, pos;
        Rectangle r;
 
-       if(xp < xbuf || xp >= &xbuf[sizeof(xbuf)])
+       if(xp < xbuf || xp >= &xbuf[nelem(xbuf)])
                xp = xbuf;
 
        h = scr->memdefont->height;