xcmsdb: Changes to 'master'

[GitLab Mirror]

 loadData.c |   21 +++++++++++++--------
 1 file changed, 13 insertions(+), 8 deletions(-)

New commits:
commit b70540f49144d517a21a04caa0e01cab9d345177
Author: Alan Coopersmith <alan.coopersmith at oracle.com>
Date:   Fri Aug 2 18:50:12 2024 -0700

    ProcessColorimetric: limit string size written by scanf()
    
    Raised by cppcheck:
    
    loadData.c:341:20: warning: sscanf() without field width limits can crash
     with huge input data. [invalidscanf]
            int ntok = sscanf(buf, "%s %s", keyword, token);
                       ^
    
    Signed-off-by: Alan Coopersmith <alan.coopersmith at oracle.com>
    Part-of: <https://gitlab.freedesktop.org/xorg/app/xcmsdb/-/merge_requests/6>

commit c2b16b542179bf61cbbf25774c4b2796047c23c1
Author: Alan Coopersmith <alan.coopersmith at oracle.com>
Date:   Fri Aug 2 18:39:46 2024 -0700

    ProcessIProfile: Avoid NULL dereference if strtok doesn't find a match
    
    Reported by cppcheck:
    
    loadData.c:552:38: warning: Either the condition 'sizeStr==0L' is redundant
     or there is possible null pointer dereference: sizeStr.
      [nullPointerRedundantCheck]
                                linenum, sizeStr);
                                         ^
    loadData.c:548:30: note: Assuming that condition 'sizeStr==0L' is not redundant
                    if ((sizeStr == NULL) ||
                                 ^
    
    Signed-off-by: Alan Coopersmith <alan.coopersmith at oracle.com>
    Part-of: <https://gitlab.freedesktop.org/xorg/app/xcmsdb/-/merge_requests/6>

commit bd3ac0d85c8efc36507e7b437a4b119ce033dff7
Author: Alan Coopersmith <alan.coopersmith at oracle.com>
Date:   Fri Aug 2 18:36:52 2024 -0700

    SCScrnClassStringOf: always return a non-NULL string
    
    Clears 4 -Wformat-overflow warnings from gcc of the form:
    
    loadData.c: In function ‘LoadSCCData’:
    loadData.c:397:83: warning: ‘%s’ directive argument is null [-Wformat-overflow=]
      397 |                             "Line %d: Keyword RGBTOXYZMAT_END mismatch for visual %s.\n",
          |                                                                                   ^~
    
    Signed-off-by: Alan Coopersmith <alan.coopersmith at oracle.com>
    Part-of: <https://gitlab.freedesktop.org/xorg/app/xcmsdb/-/merge_requests/6>

commit e9cfb815eb6c8342ea0d38e7bf14e247bd37576c
Author: Alan Coopersmith <alan.coopersmith at oracle.com>
Date:   Fri Aug 2 18:20:42 2024 -0700

    Correct comment describing DefineToStr
    
    Signed-off-by: Alan Coopersmith <alan.coopersmith at oracle.com>
    Part-of: <https://gitlab.freedesktop.org/xorg/app/xcmsdb/-/merge_requests/6>