[mapserver-commits] [mapserver/mapserver] e9e489: Fix thread safety issue in msLoadMapFromString (#4...

[GitHub]

  Branch: refs/heads/branch-6-2
  Home:   https://github.com/mapserver/mapserver
  Commit: e9e48941e9b02378de57a8ad6c6aa0d070816b06
      https://github.com/mapserver/mapserver/commit/e9e48941e9b02378de57a8ad6c6aa0d070816b06
  Author: Homme Zwaagstra <hrz at geodata.soton.ac.uk>
  Date:   2012-12-11 (Tue, 11 Dec 2012)

  Changed paths:
    M mapfile.c

  Log Message:
  -----------
  Fix thread safety issue in msLoadMapFromString (#4523)

The `TLOCK_PARSER` thread mutex is now released after the call to
`msyylex_destroy()` which otherwise clobbers global lexer variables
that may be in use in another thread.

closes #4523


  Commit: 5e3bc561ae9f2e1bd97e75ab1cfe2e2baa270a31
      https://github.com/mapserver/mapserver/commit/5e3bc561ae9f2e1bd97e75ab1cfe2e2baa270a31
  Author: Homme Zwaagstra <hrz at geodata.soton.ac.uk>
  Date:   2012-12-11 (Tue, 11 Dec 2012)

  Changed paths:
    M cgiutil.h
    M mapserv.c

  Log Message:
  -----------
  Remove redundant call to msDebugInitFromEnv (#4522)

`msSetup()` already calls `msDebugInitFromEnv()`.

Specify correct "C" linkage in `cgiutil.h`

`cgiutil.h` is the only file included by `mapserver.h` which defines
symbols and which isn't wrapped by `extern "C"`: its symbols end up in
`libmapserver` and without this fix linking against them in C++ fails.

closes #4522


Compare: https://github.com/mapserver/mapserver/compare/82da39e7a466...5e3bc561ae9f