[PATCH 1/3] sfnt2fon: Avoid out-of-bounds read (AddressSanitizer).
Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=45422 Signed-off-by: Anton Baskanov <baskanov(a)gmail.com> --- tools/sfnt2fon/sfnt2fon.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tools/sfnt2fon/sfnt2fon.c b/tools/sfnt2fon/sfnt2fon.c index 0d59bfc1db2..6427eb9f840 100644 --- a/tools/sfnt2fon/sfnt2fon.c +++ b/tools/sfnt2fon/sfnt2fon.c @@ -743,7 +743,7 @@ static struct fontinfo *fill_fontinfo( const char *face_name, int ppem, int enc, for(x = 0; x < ((info->dfCharTable[i].width + 7) / 8); x++) { for(y = 0; y < ppem; y++) { if(y < ascent - face->glyph->bitmap_top || - y >= face->glyph->bitmap.rows + ascent - face->glyph->bitmap_top) { + y >= (int)face->glyph->bitmap.rows + ascent - face->glyph->bitmap_top) { info->data[data_pos++] = 0; continue; } -- 2.25.1
Signed-off-by: Anton Baskanov <baskanov(a)gmail.com> --- fonts/ms_sans_serif.sfd | 2 +- fonts/ms_sans_serif.ttf | Bin 38536 -> 38536 bytes 2 files changed, 1 insertion(+), 1 deletion(-) diff --git a/fonts/ms_sans_serif.sfd b/fonts/ms_sans_serif.sfd index e8c720b528c..f2de1843448 100644 --- a/fonts/ms_sans_serif.sfd +++ b/fonts/ms_sans_serif.sfd @@ -5448,7 +5448,7 @@ BDFChar: 291 710 4 1 2 0 9 ^qdb$^qdb$^q]pM BDFChar: 292 711 5 0 3 11 12 OC/%g -BDFChar: 293 728 5 0 4 14 15 +BDFChar: 293 728 5 0 4 11 12 Li<=o BDFChar: 294 729 3 1 1 12 12 J,fQL diff --git a/fonts/ms_sans_serif.ttf b/fonts/ms_sans_serif.ttf index fd20edb45954559db6d054a458b67398212b71ea..8c492c7d310502dc8d4cda6b03c2c7d5caedb218 100644 GIT binary patch delta 128 zcmeBJ%ha)!$&i7Ofq_8~NU$&nxH`FnsQ)YxWMI&@U|{e*<?7_)d~KHhat4NK76t}M z5m%>R=fe{XKQryQwONhPIgpWeb5_tR4ImX-y;+ixcQWTxX<5F%3=DjKg+RuFfsl}Z W0RLYBFrR<2<5X!zfz7c~wHW~rw;wD3 delta 128 zcmeBJ%ha)!$&i7Ofq_8~NU$&nxH`FnsQ)PuWMI&@U|{e*<?7_)d~=rnat4NK76t}M z5m%>R=gSifKQm3cvRRGMIgn9cb5_tR4ImX-y;+h`a5CpqX<4Da3=DjKg+RuFfsl}Z W0RLYBFkg7G<5X!zk<GDFwHW~p(;qAV -- 2.25.1
Signed-off-by: Huw Davies <huw(a)codeweavers.com>
Signed-off-by: Anton Baskanov <baskanov(a)gmail.com> --- fonts/small_fonts.sfd | 2 +- fonts/small_fonts.ttf | Bin 19068 -> 19068 bytes 2 files changed, 1 insertion(+), 1 deletion(-) diff --git a/fonts/small_fonts.sfd b/fonts/small_fonts.sfd index 28dcee28e12..e8494c8dc8e 100644 --- a/fonts/small_fonts.sfd +++ b/fonts/small_fonts.sfd @@ -4638,7 +4638,7 @@ BDFChar: 281 369 5 1 4 0 7 :nRfMOH>QC BDFChar: 282 355 3 1 2 -2 5 JA?\cJ3ZB8 -BDFChar: 283 729 2 0 0 10 10 +BDFChar: 283 729 2 0 0 8 8 J,fQL BDFChar: 284 8470 9 0 8 0 6 `;mo.V#[:kQ[k;#MuWhX diff --git a/fonts/small_fonts.ttf b/fonts/small_fonts.ttf index a35230941a77b0311839cef1c2172fd854d43887..0e5e7f4127b4f9ff6c7d8f6fcc9a4dad218aa2f1 100644 GIT binary patch delta 317 zcmX}nF-yZx5Ww-fDs7T$OqwS|`-o=IO(aWE5DKY*w&)-_^*cBS;^r(44ssRT#lg9s zz>nYuaBy(a)J97Ow)ddZMC{2vFud+^K@%@h+r0O&}T!Ozmev&q->Gr-OPK+wz5qrukZ z=MzBx62N-Q($m4)ee&ICPG;Nq(?ff<v3J#y>!E*RVUwew#uo1nb!07MVd0dISI2RP z?7}W*wE04u!*^2R7t!qkpj~*i_B<lDa4YTdhd7sW=?brpbmZj#Uao4b6p^3%mG=2$ zq_M;2(tvM82S&bP!dizRkuueGL-DJ)ReqPQ(a)vrFa9H2XoYaPc#`cIehlICQrG3Mj( F?mx=kK-T~O delta 317 zcmX}nF-yZh6u|L!RWQkGytJprdZfn1x`<>c3PK?@&=ws;>EL&85X8+{96HFW;4Ti% z{RDmx2S?X-5bY)PB|~ob9}j--;LKQ<v4}tbK#j8uUJ{>NUQO(a)c0QQdo>g^;x?Y6eR zUjaI|0M<(qUvyhf(X28YPIkplTi~R5c(=mWbLYVl76m;mY&z=cz*+FZ!pR>mj^iNO znVrv~N;m9W8gW<YowdvWs+lacl!$KT7TTjPb~Q(a)5b!zl=pi%&ts!}V3=%rqv*XX>j z#X4PcH|UYIZ}=<5FSYL(a)DpPD%HtB<1gFd-U`ehx?0k-C0slyOa|LJ^Q+M#Hm#U7mv G4*mg>b3oSs -- 2.25.1
Signed-off-by: Huw Davies <huw(a)codeweavers.com>
participants (2)
-
Anton Baskanov -
Huw Davies