/mythes/mythes-ssizet.patch

https://bitbucket.org/markjenkins/libreoffice_ubuntu-debian-fixes · Patch · 20 lines · 19 code · 1 blank · 0 comment · 0 complexity · 205d71b4ab6bca0f7519e487c582562c MD5 · raw file 

    

  1. --- misc/mythes-1.2.3/mythes.cxx	2012-06-29 13:16:55.812939142 +0100
    2. 

  2. +++ misc/build/mythes-1.2.3/mythes.cxx	2012-06-29 13:17:21.159198507 +0100
    3. 

  3. @@ -48,7 +48,7 @@
    4. 

  4.      len = readLine(pifile,wrd,MAX_WD_LEN);
    5. 

  5.      int idxsz = atoi(wrd); 
    6. 

  6.     
    7. 

  7. -    if (idxsz <= 0 || idxsz > std::numeric_limits<ssize_t>::max() / sizeof(sizeof(char*))) {
    8. 

  8. +    if (idxsz <= 0 || idxsz > std::numeric_limits<int>::max() / sizeof(sizeof(char*))) {
    9. 

  9.         fprintf(stderr,"Error - bad index %d\n", idxsz);
    10. 

  10.         fclose(pifile);
    11. 

  11.         return 0;
    12. 

  12. @@ -176,7 +176,7 @@
    13. 

  13.           return 0;
    14. 

  14.      }          
    15. 

  15.      int nmeanings = atoi(buf+np+1);
    16. 

  16. -    if (nmeanings < 0 || nmeanings > std::numeric_limits<ssize_t>::max() / sizeof(mentry))
    17. 

  17. +    if (nmeanings < 0 || nmeanings > std::numeric_limits<int>::max() / sizeof(mentry))
    18. 

  18.          nmeanings = 0;
    19. 

  19.      *pme = (mentry*)(nmeanings ? malloc(nmeanings * sizeof(mentry)) : NULL);
    20. 

  20.      if (!(*pme)) {
    21.