git Service of IN-Ulm e.V. Explore Help
Sign In
cbiedl
/
file
1
0
Fork 0
Files Pull Requests 0 Wiki
Tree: 29c3d2391f
Branches Tags
file
/
debian
/
patches
/
cherry-pick.c0c0032.fix-memory-leak.patch

cherry-pick.c0c0032.fix-memory-leak.patch 714 B
History Raw

12345678910111213141516171819202122232425262728 
  1. Upstream-Author: Christos Zoulas <christos@zoulas.com>
    2. 

  2. Date: Fri Feb 21 14:32:48 2014 +0000
    3. 

  3. Upstream-Commit: c0c0032b9e9eb57b91fefef905a3b018bab492d9
    4. 

  4. Description:
    5. 

  5.  Fix memory leak (Anatol Belski)
    6. 

  6. 

  7. --- a/src/softmagic.c
    8. 

  8. +++ b/src/softmagic.c
    9. 

  9. @@ -1755,12 +1755,16 @@
    10. 

  10.  		ms->offset = soffset;
    11. 

  11.  		if (rv == 1) {
    12. 

  12.  			if ((ms->flags & (MAGIC_MIME|MAGIC_APPLE)) == 0 &&
    13. 

  13. -			    file_printf(ms, F(m->desc, "%u"), offset) == -1)
    14. 

  14. +			    file_printf(ms, F(m->desc, "%u"), offset) == -1) {
    15. 

  15. +				free(rbuf);
    16. 

  16.  				return -1;
    17. 

  17. -			if (file_printf(ms, "%s", rbuf) == -1)
    18. 

  18. +			}
    19. 

  19. +			if (file_printf(ms, "%s", rbuf) == -1) {
    20. 

  20. +				free(rbuf);
    21. 

  21.  				return -1;
    22. 

  22. -			free(rbuf);
    23. 

  23. +			}
    24. 

  24.  		}
    25. 

  25. +		free(rbuf);
    26. 

  26.  		return rv;
    27. 

  27.  
    28. 

  28.  	case FILE_USE:
    29.