From: petgit <mo1607bil>
Date: Wed, 27 Aug 2014 06:05:22 +0000 (+0200)
Subject: Exception calling: g_hash_table_destroy(im->rrd_map)
X-Git-Tag: v1.5.0-rc1~46^2~1
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=4113bf3aa4d2adb65f9995868c2c5e92814ccf0e;p=thirdparty%2Frrdtool-1.x.git

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 5d89cff8..b99d0bee 100644
--- 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 6ece051b..9fc0551e 100644
--- 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 17519543..e13b7aa4 100644
--- 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>