util: Changes to 'master'

[GitLab Mirror]

 ucs2any.c |   27 ++++++++++++++++++++++++---
 1 file changed, 24 insertions(+), 3 deletions(-)

New commits:
commit 564adb96f10a0bf43d67401b05ba0fcafe7c0a83
Author: Alan Coopersmith <alan.coopersmith at oracle.com>
Date:   Mon Nov 16 18:22:23 2020 -0800

    ucs2any: handle NULL returns from zquotedcpy()
    
    bdf file for testing:
    
    STARTFONT 2.1
    FONT "Bad quotes test font-ISO10646-1
    SIZE 7 75 75
    FONTBOUNDINGBOX 5 7 0 -1
    STARTPROPERTIES 3
    SPACING "C
    SLANT "R
    ENDPROPERTIES
    CHARS 0
    ENDFONT
    
    Before this fix, the above segfaults when the NULL return from
    zquotedcpy() is passed to other functions expecting a string.
    
    Fixes: 21063_61 & 21063_86 from https://cyber-itl.org/2020/10/28/citl-7000-defects.html
    
    Signed-off-by: Alan Coopersmith <alan.coopersmith at oracle.com>

commit f78cd55ccd913855cc5569dfe2a9213e217bc469
Author: Alan Coopersmith <alan.coopersmith at oracle.com>
Date:   Sun Nov 15 17:06:26 2020 -0800

    ucs2any: avoid segfaults if SLANT property is missing
    
    Test case:
     grep -v SLANT ../../misc-misc/5x7.bdf > 5x7-noslant.bdf
     ucs2any 5x7-noslant.bdf ../map-ISO8859-1 -d
    
    Before this fix, the above segfaults in strcmp with a NULL slant pointer.
    
    Fixes: 21063_131 from https://cyber-itl.org/2020/10/28/citl-7000-defects.html
    
    Signed-off-by: Alan Coopersmith <alan.coopersmith at oracle.com>