[mapserver-commits] [mapserver/mapserver] 4b90c2: Fix a memory leak in `freeClass()` exposed by valg...

GitHub noreply at github.com
Tue Jul 23 06:21:53 PDT 2013


  Branch: refs/heads/master
  Home:   https://github.com/mapserver/mapserver
  Commit: 4b90c2404f4b3209f491ab84780f735fba4a119d
      https://github.com/mapserver/mapserver/commit/4b90c2404f4b3209f491ab84780f735fba4a119d
  Author: Homme Zwaagstra <hrz at geodata.soton.ac.uk>
  Date:   2013-07-04 (Thu, 04 Jul 2013)

  Changed paths:
    M mapfile.c

  Log Message:
  -----------
  Fix a memory leak in `freeClass()` exposed by valgrind's memcheck

In `msGrowClassLabels()` memory is assigned to
`class->labels[class->numlabels]` but was only freed to
`class->numstyles-1` in `freeClass()`.  This fix ensures the last
label is freed.


  Commit: ef10744f0fe037fa2a29bf99883725d17dec0e1d
      https://github.com/mapserver/mapserver/commit/ef10744f0fe037fa2a29bf99883725d17dec0e1d
  Author: Homme Zwaagstra <hrz at geodata.soton.ac.uk>
  Date:   2013-07-04 (Thu, 04 Jul 2013)

  Changed paths:
    M mapfile.c

  Log Message:
  -----------
  Revert "Fix a memory leak in `freeClass()` exposed by ... memcheck"

This reverts commit 4b90c2404f4b3209f491ab84780f735fba4a119d which as
discussed in issue #4685 is not a valid solution.


  Commit: bb9d6df783f8de552d485054b285ace97c26be65
      https://github.com/mapserver/mapserver/commit/bb9d6df783f8de552d485054b285ace97c26be65
  Author: Homme Zwaagstra <hrz at geodata.soton.ac.uk>
  Date:   2013-07-04 (Thu, 04 Jul 2013)

  Changed paths:
    M mapfile.c

  Log Message:
  -----------
  Ensure class labels are free'd in cases where label loading fails


  Commit: 34ec0ca2af800a29c3f00a690a321875a883cf32
      https://github.com/mapserver/mapserver/commit/34ec0ca2af800a29c3f00a690a321875a883cf32
  Author: Thomas Bonfort <thomas.bonfort at gmail.com>
  Date:   2013-07-23 (Tue, 23 Jul 2013)

  Changed paths:
    M mapfile.c

  Log Message:
  -----------
  Merge pull request #4685 from homme/grow-class-labels-leak-fix

Fix a memory leak on failed parsing in `freeClass()` (#4685)


Compare: https://github.com/mapserver/mapserver/compare/e3633571ad4f...34ec0ca2af80


More information about the mapserver-commits mailing list