From 84530eee3742ba8ad0dced0dfd0fca4abaf2be86 Mon Sep 17 00:00:00 2001
From: Holger Vogt <holger.vogt@uni-due.de>
Date: Wed, 29 May 2019 23:02:18 +0200
Subject: [PATCH] [PATCH #55-2] Prevent reading from a NULL pointer

---
 src/frontend/vectors.c | 14 +++++++++-----
 1 file changed, 9 insertions(+), 5 deletions(-)

diff --git a/src/frontend/vectors.c b/src/frontend/vectors.c
index 060a63476..3751e4bef 100644
--- a/src/frontend/vectors.c
+++ b/src/frontend/vectors.c
@@ -764,11 +764,15 @@ vec_new(struct dvec *d)
     if (plot_cur == NULL) {
         fprintf(cp_err, "vec_new: Internal Error: no cur plot\n");
     }
-    plot_cur->pl_lookup_valid = FALSE;
-    if ((d->v_flags & VF_PERMANENT) && (plot_cur->pl_scale == NULL))
-        plot_cur->pl_scale = d;
-    if (!d->v_plot)
-        d->v_plot = plot_cur;
+    else {
+        plot_cur->pl_lookup_valid = FALSE;
+        if ((d->v_flags & VF_PERMANENT) && (plot_cur->pl_scale == NULL)) {
+            plot_cur->pl_scale = d;
+        }
+        if (!d->v_plot) {
+            d->v_plot = plot_cur;
+        }
+    }
 
     /* This code appears to be a patch for incorrectly specified vectors */
     if (d->v_numdims < 1) {