From 0d19f1ca9621cfd9d6d774d649d782f04d76f35d Mon Sep 17 00:00:00 2001
From: Pieter Lexis <pieter.lexis@powerdns.com>
Date: Wed, 14 Feb 2018 11:00:54 +0100
Subject: [PATCH] ixfrdist: Prevent a nullptr exception

---
 pdns/ixfrdist.cc | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/pdns/ixfrdist.cc b/pdns/ixfrdist.cc
index a0465633e7..d8d4150dec 100644
--- a/pdns/ixfrdist.cc
+++ b/pdns/ixfrdist.cc
@@ -260,16 +260,16 @@ void updateThread() {
         if (g_verbose) {
           cerr<<"[INFO] Wrote zonedata for "<<domain<<" with serial "<<soa->d_st.serial<<" to "<<dir<<endl;
         }
+        {
+          std::lock_guard<std::mutex> guard(g_soas_mutex);
+          g_soas[domain] = soa;
+        }
+
       } catch (ResolverException &e) {
         cerr<<"[WARNING] Could not retrieve AXFR for '"<<domain<<"': "<<e.reason<<endl;
       } catch (runtime_error &e) {
         cerr<<"[WARNING] Could not save zone '"<<domain<<"' to disk: "<<e.what()<<endl;
       }
-      {
-        std::lock_guard<std::mutex> guard(g_soas_mutex);
-        g_soas[domain] = soa;
-      }
-
       // Now clean up the directory
       cleanUpDomain(domain);
     } /* for (const auto &domain : domains) */
-- 
2.47.2