[Date Prev][Date Next] [Thread Prev][Thread Next] [Date Index] [Thread Index]

[Git][xorg-team/lib/libx11][debian-unstable] Fix 001_xim_regression.diff to actually build.



Title: GitLab

Julien Cristau pushed to branch debian-unstable at X Strike Force / lib / libx11

Commits:

2 changed files:

Changes:

  • debian/changelog
    1
    +libx11 (2:1.6.10-3) unstable; urgency=medium
    
    2
    +
    
    3
    +  * Fix 001_xim_regression.diff to actually build.
    
    4
    +
    
    5
    + -- Julien Cristau <jcristau@debian.org>  Mon, 03 Aug 2020 08:44:37 +0200
    
    6
    +
    
    1 7
     libx11 (2:1.6.10-2) unstable; urgency=medium
    
    2 8
     
    
    3 9
       * Fix regression introduced in 1.6.10 (closes: #966691)
    

  • debian/patches/001_xim_regression.diff
    ... ... @@ -13,7 +13,7 @@ index 2491908e..e10048f9 100644
    13 13
      	    if (num > (USHRT_MAX / sizeof(XIMStyle)))
    
    14 14
      		return False;
    
    15 15
     -	    if ((sizeof(num) + (num * sizeof(XIMStyle))) > data_len)
    
    16
    -+	    if ((2 * sizeof(CARD16) + (num * sizeof(CARD32) > data_len)
    
    16
    ++	    if ((2 * sizeof(CARD16) + (num * sizeof(CARD32))) > data_len)
    
    17 17
      		return False;
    
    18 18
      	    alloc_len = sizeof(XIMStyles) + sizeof(XIMStyle) * num;
    
    19 19
      	    if (alloc_len < sizeof(XIMStyles))
    


  • Reply to: