<html xmlns:v="urn:schemas-microsoft-com:vml" xmlns:o="urn:schemas-microsoft-com:office:office" xmlns:w="urn:schemas-microsoft-com:office:word" xmlns:m="http://schemas.microsoft.com/office/2004/12/omml" xmlns="http://www.w3.org/TR/REC-html40">
<head>
<META HTTP-EQUIV="Content-Type" CONTENT="text/html; charset=us-ascii">
<meta name=Generator content="Microsoft Word 12 (filtered medium)">
<style>
<!--
/* Font Definitions */
@font-face
{font-family:"Cambria Math";
panose-1:2 4 5 3 5 4 6 3 2 4;}
@font-face
{font-family:Calibri;
panose-1:2 15 5 2 2 2 4 3 2 4;}
/* Style Definitions */
p.MsoNormal, li.MsoNormal, div.MsoNormal
{margin:0in;
margin-bottom:.0001pt;
font-size:11.0pt;
font-family:"Calibri","sans-serif";}
a:link, span.MsoHyperlink
{mso-style-priority:99;
color:blue;
text-decoration:underline;}
a:visited, span.MsoHyperlinkFollowed
{mso-style-priority:99;
color:purple;
text-decoration:underline;}
span.EmailStyle17
{mso-style-type:personal-compose;
font-family:"Calibri","sans-serif";
color:windowtext;}
.MsoChpDefault
{mso-style-type:export-only;}
@page Section1
{size:8.5in 11.0in;
margin:1.0in 1.0in 1.0in 1.0in;}
div.Section1
{page:Section1;}
-->
</style>
<!--[if gte mso 9]><xml>
<o:shapedefaults v:ext="edit" spidmax="1026" />
</xml><![endif]--><!--[if gte mso 9]><xml>
<o:shapelayout v:ext="edit">
<o:idmap v:ext="edit" data="1" />
</o:shapelayout></xml><![endif]-->
</head>
<body lang=EN-US link=blue vlink=purple>
<div class=Section1>
<p class=MsoNormal>There is a memory leak in msInsertLayer. The below patch
fixes it. Can someone else review it and tell me what I should do with it? <o:p></o:p></p>
<p class=MsoNormal><o:p> </o:p></p>
<p class=MsoNormal>Thanks,<o:p></o:p></p>
<p class=MsoNormal><o:p> </o:p></p>
<p class=MsoNormal>Ned.<o:p></o:p></p>
<p class=MsoNormal><o:p> </o:p></p>
<p class=MsoNormal>Index: S:/3rdParty/GIS/MapServer/mapobject.c<o:p></o:p></p>
<p class=MsoNormal>===================================================================<o:p></o:p></p>
<p class=MsoNormal>--- S:/3rdParty/GIS/MapServer/mapobject.c (revision
15750)<o:p></o:p></p>
<p class=MsoNormal>+++ S:/3rdParty/GIS/MapServer/mapobject.c (working copy)<o:p></o:p></p>
<p class=MsoNormal>@@ -498,10 +498,20 @@<o:p></o:p></p>
<p class=MsoNormal> }<o:p></o:p></p>
<p class=MsoNormal> <o:p></o:p></p>
<p class=MsoNormal> /* Ensure there is room for a new layer */<o:p></o:p></p>
<p class=MsoNormal>- if (msGrowMapLayers(map) == NULL)<o:p></o:p></p>
<p class=MsoNormal>- return -1;<o:p></o:p></p>
<p class=MsoNormal>- /* Catch attempt to insert past end of layers array */<o:p></o:p></p>
<p class=MsoNormal>- else if (nIndex >= map->numlayers) {<o:p></o:p></p>
<p class=MsoNormal>+ if (map->numlayers == map->maxlayers)<o:p></o:p></p>
<p class=MsoNormal>+ {<o:p></o:p></p>
<p class=MsoNormal>+ if (msGrowMapLayers(map) ==
NULL)<o:p></o:p></p>
<p class=MsoNormal>+ return -1;<o:p></o:p></p>
<p class=MsoNormal>+ }<o:p></o:p></p>
<p class=MsoNormal>+<o:p></o:p></p>
<p class=MsoNormal>+ /* msGrowMapLayers allocates the new layer
which we don't need to do since we have 1 that we are inserting <o:p></o:p></p>
<p class=MsoNormal>+ not sure if it is possible
for this to be non null otherwise, but better to check since this function<o:p></o:p></p>
<p class=MsoNormal>+ replaces the value */<o:p></o:p></p>
<p class=MsoNormal>+ if (map->layers[map->numlayers]!=NULL)<o:p></o:p></p>
<p class=MsoNormal>+ free(map->layers[map->numlayers]);<o:p></o:p></p>
<p class=MsoNormal>+<o:p></o:p></p>
<p class=MsoNormal>+ /* Catch attempt to insert past end of layers
array */<o:p></o:p></p>
<p class=MsoNormal>+ if (nIndex >= map->numlayers) {<o:p></o:p></p>
<p class=MsoNormal> msSetError(MS_CHILDERR, "Cannot insert layer
beyond index %d",<o:p></o:p></p>
<p class=MsoNormal> "msInsertLayer()",
map->numlayers-1);<o:p></o:p></p>
<p class=MsoNormal> return -1;<o:p></o:p></p>
<p class=MsoNormal><o:p> </o:p></p>
</div>
</body>
</html>