From cdd587d674974a753dae862ba716b68a6b56dfa5 Mon Sep 17 00:00:00 2001
From: sr
Date: Sun, 6 Jan 2013 19:42:09 +0100
Subject: [SERVER] Fix nullpointer deref when last image is deleted

---
 src/server/job.c      | 3 ++-
 src/server/saveload.c | 2 ++
 2 files changed, 4 insertions(+), 1 deletion(-)

(limited to 'src/server')

diff --git a/src/server/job.c b/src/server/job.c
index 4d55080..6281b3a 100644
--- a/src/server/job.c
+++ b/src/server/job.c
@@ -313,7 +313,8 @@ static void connect_proxy_images()
 			if (isworking && !(alloc_cache && image->cache_file))
 			{
 				image->working = TRUE;
-				memlogf("[WARNING] Proxy-Mode enabled without cache directory. This will most likely hurt performance.");
+				if (!image->cache_file)
+					memlogf("[WARNING] Proxy-Mode enabled without cache directory. This will most likely hurt performance.");
 				goto continue_with_next_image;
 			}
 			snprintf(cfname, 1000, "%s", image->cache_file);
diff --git a/src/server/saveload.c b/src/server/saveload.c
index a9934d4..8c48304 100644
--- a/src/server/saveload.c
+++ b/src/server/saveload.c
@@ -556,6 +556,8 @@ void dnbd3_exec_delete(int save_if_changed)
 			g_free(image);
 			// Restart iteration as it would be messed up now
 			image_iterator = _dnbd3_images;
+			if (image_iterator == NULL)
+				break;
 		}
 	} // END image iteration
 	pthread_spin_unlock(&_spinlock);
-- 
cgit v1.2.3-55-g7522