Fix double free, null texture drop

kwolekr · kwolekr · commit ce901f4c4ca9 · 2013-04-12T17:20:05.000-04:00
diff --git a/src/emerge.cpp b/src/emerge.cpp
@@ -97,9 +97,6 @@ EmergeManager::~EmergeManager() {
 		delete mapgen[i];
 	}
 	emergethread.clear();
-
-	for (unsigned int i = 0; i < mapgen.size(); i++)
-		delete mapgen[i];
 	mapgen.clear();
 
 	for (unsigned int i = 0; i < ores.size(); i++)
diff --git a/src/tile.cpp b/src/tile.cpp
@@ -480,7 +480,8 @@ TextureSource::~TextureSource()
 			driver->removeTexture(t);
 
 		//cleanup source image
-		iter->atlas_img->drop();
+		if (iter->atlas_img)
+			iter->atlas_img->drop();
 	}
 	m_atlaspointer_cache.clear();
 

Original file line number	Diff line number	Diff line change
`@@ -97,9 +97,6 @@ EmergeManager::~EmergeManager() {`
`97`	`97`	`delete mapgen[i];`
`98`	`98`	`}`
`99`	`99`	`emergethread.clear();`
`100`		`-`
`101`		`- for (unsigned int i = 0; i < mapgen.size(); i++)`
`102`		`- delete mapgen[i];`
`103`	`100`	`mapgen.clear();`
`104`	`101`
`105`	`102`	`for (unsigned int i = 0; i < ores.size(); i++)`
Original file line number	Diff line number	Diff line change
`@@ -480,7 +480,8 @@ TextureSource::~TextureSource()`
`480`	`480`	`driver->removeTexture(t);`
`481`	`481`
`482`	`482`	`//cleanup source image`
`483`		`- iter->atlas_img->drop();`
	`483`	`+ if (iter->atlas_img)`
	`484`	`+ iter->atlas_img->drop();`
`484`	`485`	`}`
`485`	`486`	`m_atlaspointer_cache.clear();`
`486`	`487`