From 12f5e6028ce91e67143c7dad317ffe1430603193 Mon Sep 17 00:00:00 2001
From: jj <john-git@ofjj.net>
Date: Sat, 29 Sep 2012 01:38:32 +0200
Subject: [PATCH] manipulator: avoid NULL deref with unassigned job in unit
 list

---
 plugins/manipulator.cpp | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/plugins/manipulator.cpp b/plugins/manipulator.cpp
index 953cf2ba9..feceb08ec 100644
--- a/plugins/manipulator.cpp
+++ b/plugins/manipulator.cpp
@@ -383,8 +383,12 @@ viewscreen_unitlaborsst::viewscreen_unitlaborsst(vector<df::unit*> &src, int cur
 
     for (size_t i = 0; i < src.size(); i++)
     {
-        UnitInfo *cur = new UnitInfo;
         df::unit *unit = src[i];
+        if (!unit)
+            continue;
+
+        UnitInfo *cur = new UnitInfo;
+
         cur->unit = unit;
         cur->allowEdit = true;
         cur->active_index = active_idx[unit];