From 4d912748b3db3981fd03cdf74df7da696320f46d Mon Sep 17 00:00:00 2001
From: Mark Wells <mark@freeside.biz>
Date: Tue, 20 Mar 2012 11:33:50 -0700
Subject: [PATCH] warn during upgrade if addr_block records are missing, #17040

---
 FS/FS/svc_broadband.pm | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/FS/FS/svc_broadband.pm b/FS/FS/svc_broadband.pm
index e9917ffd8..06a300138 100755
--- a/FS/FS/svc_broadband.pm
+++ b/FS/FS/svc_broadband.pm
@@ -640,6 +640,11 @@ sub _upgrade_data {
       routernum => ''
     })) {
     my $addr_block = $self->addr_block;
+    if ( !$addr_block ) {
+      # super paranoid mode
+      warn "WARNING: svcnum ".$self->svcnum." is assigned to addr_block ".$self->blocknum.", which does not exist; skipped.\n";
+      next;
+    }
     my $ip_addr = $self->ip_addr;
     my $routernum = $addr_block->routernum;
     if ( $routernum ) {
-- 
2.11.0