Skip to content
Permalink
Browse files

Fix msOGREscapeSQLParam could return random data (#4335)

  • Loading branch information...
Alan Boudreault
Alan Boudreault committed Jun 15, 2012
1 parent 3ef03d9 commit f51753fa3d2b1790849ed1f023a7505a3bc9772c
Showing with 5 additions and 4 deletions.
  1. +2 −0 HISTORY.TXT
  2. +3 −4 mapogr.cpp
@@ -14,6 +14,8 @@ For a complete change history, please see the Git log comments.
Current Version (future 6.0.4, GIT branch-6-0):
-----------------------------------------------

- Fix msOGREscapeSQLParam could return random data (#4335)

- Fixed locations of supported and native formats in Capabilities and CoverageDescriptions for WCS 2.0 (#4003)

- Made format parameter for WCS 2.0 GetCoverage requests optional (#4003)
@@ -3710,17 +3710,16 @@ char *msOGREscapeSQLParam(layerObj *layer, const char *pszString)
CPLES_SQL );
pszEscapedStr = msStrdup(pszEscapedOGRStr);
CPLFree(pszEscapedOGRStr);
return pszEscapedStr;
}
return pszEscapedStr;
#else
/* ------------------------------------------------------------------
* OGR Support not included...
* ------------------------------------------------------------------ */

msSetError(MS_MISCERR, "OGR support is not available.",
"msOGREscapeSQLParam()");
return NULL;

return NULL;
#endif /* USE_OGR */
}

@@ -3753,8 +3752,8 @@ char *msOGREscapePropertyName(layerObj *layer, const char *pszString)

msSetError(MS_MISCERR, "OGR support is not available.",
"msOGREscapePropertyName()");
return NULL;

return NULL;
#endif /* USE_OGR */
}
/************************************************************************/

0 comments on commit f51753f

Please sign in to comment.
You can’t perform that action at this time.