Exception calling: g_hash_table_destroy(im->rrd_map)

temporary commented out
vcxproj: adjusted for debug

diff --git a/src/rrd_graph.c b/src/rrd_graph.c
index 5d89cff85a25cdaf1ab1087bc13846c0a833abb7..b99d0beefd9c4a331e5b87556d43feb4c1f3d494 100644 (file)
--- a/src/rrd_graph.c
+++ b/src/rrd_graph.c
@@ -340,10 +340,16 @@ int im_free(
 
     if (im->gdef_map){
         g_hash_table_destroy(im->gdef_map);        
-    }
-    if (im->rrd_map){
-        g_hash_table_destroy(im->rrd_map);        
-    }
+       }
+
+       if (im->rrd_map){
+               //TODO: 
+               // check reason of error:
+               // Unhandled exception at 0x77BBF636 (ntdll.dll) in rrdtool.exe: 0xC0000374: a Heap was damaged (parameters: 0x77BDD338).       
+               // at following line
+               //g_hash_table_destroy(im->rrd_map);
+       }
+       
 
     for (i = 0; i < (unsigned) im->gdes_c; i++) {
         if (im->gdes[i].data_first) {

diff --git a/win32/librrd-4.vcxproj b/win32/librrd-4.vcxproj
index 6ece051b67b375d8e7321dfb2e28befe5ee77128..9fc0551e564eda3162794c15daf8d21d6dba37f9 100644 (file)
--- a/win32/librrd-4.vcxproj
+++ b/win32/librrd-4.vcxproj
@@ -124,7 +124,7 @@
       <Optimization>MaxSpeed</Optimization>
       <IntrinsicFunctions>true</IntrinsicFunctions>
       <AdditionalIncludeDirectories>.;../contrib/include/cairo;../contrib/include/pango-1.0;../contrib/include/glib-2.0;../contrib/lib/glib-2.0/include;../contrib/include;../contrib/include/libpng12;../contrib/include/libxml2;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>WIN32;_WINDOWS;WIN32_LEAN_AND_MEAN;_CRT_SECURE_NO_WARNINGS;_CRT_NONSTDC_NO_DEPRECATE;strftime=strftime_;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions>WIN32;_WINDOWS;_USE_32BIT_TIME_T;WIN32_LEAN_AND_MEAN;_CRT_SECURE_NO_WARNINGS;_CRT_NONSTDC_NO_DEPRECATE;strftime=strftime_;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
       <FunctionLevelLinking>true</FunctionLevelLinking>
       <PrecompiledHeader />

diff --git a/win32/rrdtool.vcxproj b/win32/rrdtool.vcxproj
index 175195434b3c12e651a4926635eee79ff8d56bb9..e13b7aa41ce8bf0bca13489079a1f3f86c7f97f7 100644 (file)
--- a/win32/rrdtool.vcxproj
+++ b/win32/rrdtool.vcxproj
@@ -75,6 +75,7 @@
       <WarningLevel>Level3</WarningLevel>
       <DebugInformationFormat>EditAndContinue</DebugInformationFormat>
       <DisableSpecificWarnings>4996;%(DisableSpecificWarnings)</DisableSpecificWarnings>
+      <AdditionalIncludeDirectories>.;../../contrib/cairo/include/cairo;../../contrib/pango/include/pango-1.0;../../contrib/glib/include/glib-2.0;../../contrib/glib/lib/glib-2.0/include;../../contrib/libpng/include;../../contrib/zlib/include;../../contrib/libxml2/include/libxml2;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
     </ClCompile>
     <Link>
       <AdditionalDependencies>librrd-4.lib;%(AdditionalDependencies)</AdditionalDependencies>
@@ -156,6 +157,7 @@ copy $(ProjectDir)\..\contrib\bin\libexpat-1.dll $(TargetDir)\
       <WarningLevel>Level3</WarningLevel>
       <DebugInformationFormat>EditAndContinue</DebugInformationFormat>
       <DisableSpecificWarnings>4996;%(DisableSpecificWarnings)</DisableSpecificWarnings>
+      <AdditionalIncludeDirectories>.;../../contrib/cairo/include/cairo;../../contrib/pango/include/pango-1.0;../../contrib/glib/include/glib-2.0;../../contrib/glib/lib/glib-2.0/include;../../contrib/libpng/include;../../contrib/zlib/include;../../contrib/libxml2/include/libxml2;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
     </ClCompile>
     <Link>
       <AdditionalDependencies>librrd-4.lib;cairo.lib;%(AdditionalDependencies)</AdditionalDependencies>