diff options
| author | Bin Meng <bmeng.cn@gmail.com> | 2022-05-18 13:36:18 +0800 |
|---|---|---|
| committer | Anatolij Gustschin <agust@denx.de> | 2022-06-25 08:10:21 +0200 |
| commit | 5f71b2f105e5d71e0c5204ba9b1b4def48733af7 (patch) | |
| tree | d94cdc7e371e469132337c335f31faf577744bf0 | |
| parent | c527e3f52db34ce945ebea55e8d16c6e8fda2705 (diff) | |
| download | u-boot-5f71b2f105e5d71e0c5204ba9b1b4def48733af7.zip u-boot-5f71b2f105e5d71e0c5204ba9b1b4def48733af7.tar.gz u-boot-5f71b2f105e5d71e0c5204ba9b1b4def48733af7.tar.bz2 | |
driver: video: Check allocated pointers
The codes that call STBTT_malloc() / stbtt__new_active() do not check
the return value at present which may cause segfault.
Signed-off-by: Bin Meng <bmeng.cn@gmail.com>
| -rw-r--r-- | drivers/video/stb_truetype.h | 18 |
1 files changed, 14 insertions, 4 deletions
diff --git a/drivers/video/stb_truetype.h b/drivers/video/stb_truetype.h index 26f4ac2..438bfce 100644 --- a/drivers/video/stb_truetype.h +++ b/drivers/video/stb_truetype.h @@ -1768,10 +1768,13 @@ static void stbtt__rasterize_sorted_edges(stbtt__bitmap *result, stbtt__edge *e, int s; // vertical subsample index unsigned char scanline_data[512], *scanline; - if (result->w > 512) + if (result->w > 512) { scanline = (unsigned char *) STBTT_malloc(result->w, userdata); - else + if (!scanline) + return; + } else { scanline = scanline_data; + } y = off_y * vsubsample; e[n].y0 = (off_y + result->h) * (float) vsubsample + 1; @@ -1821,6 +1824,8 @@ static void stbtt__rasterize_sorted_edges(stbtt__bitmap *result, stbtt__edge *e, while (e->y0 <= scan_y) { if (e->y1 > scan_y) { stbtt__active_edge *z = stbtt__new_active(&hh, e, off_x, scan_y, userdata); + if (!z) + return; // find insertion point if (active == NULL) active = z; @@ -2068,10 +2073,13 @@ static void stbtt__rasterize_sorted_edges(stbtt__bitmap *result, stbtt__edge *e, int y,j=0, i; float scanline_data[129], *scanline, *scanline2; - if (result->w > 64) + if (result->w > 64) { scanline = (float *) STBTT_malloc((result->w*2+1) * sizeof(float), userdata); - else + if (!scanline) + return; + } else { scanline = scanline_data; + } scanline2 = scanline + result->w; @@ -2105,6 +2113,8 @@ static void stbtt__rasterize_sorted_edges(stbtt__bitmap *result, stbtt__edge *e, while (e->y0 <= scan_y_bottom) { if (e->y0 != e->y1) { stbtt__active_edge *z = stbtt__new_active(&hh, e, off_x, scan_y_top, userdata); + if (!z) + return; STBTT_assert(z->ey >= scan_y_top); // insert at front z->next = active; |