msCleanup(): fixes so that calling it twice in non-USE_THREAD mode works

MapServer · Sep 30, 2019 · 6619408 · 6619408
1 parent f3c7fa6
commit 6619408
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 0 deletions.
diff --git a/fontcache.c b/fontcache.c
@@ -97,6 +97,7 @@ void msFreeFontCache(ft_cache *c) {
     UT_HASH_DEL(c->bitmap_glyph_cache, cur_bitmap);
     free(cur_bitmap);
   }
+  memset(c,0,sizeof(ft_cache));
 }
 
 ft_cache* msGetFontCache() {

diff --git a/mapgeos.c b/mapgeos.c
@@ -137,6 +137,7 @@ void msGEOSCleanup()
 {
 #ifndef USE_THREAD
   finishGEOS_r(geos_handle);
+  geos_handle = NULL;
 #else
   geos_thread_info_t *link;
   msAcquireLock( TLOCK_GEOS );