From 9b0e06a8e8cffde10dc2ddc5f6bd41e4eb26b2ff Mon Sep 17 00:00:00 2001
From: William S Fulton <wsf@fultondesigns.co.uk>
Date: Sat, 13 Jan 2018 07:57:30 +0000
Subject: [PATCH] Seg fault fix running uffi tests

---
 Source/Modules/uffi.cxx | 31 ++++++++++++++++---------------
 1 file changed, 16 insertions(+), 15 deletions(-)

diff --git a/Source/Modules/uffi.cxx b/Source/Modules/uffi.cxx
index d56ed3b1f..10a53a561 100644
--- a/Source/Modules/uffi.cxx
+++ b/Source/Modules/uffi.cxx
@@ -363,23 +363,24 @@ int UFFI::classHandler(Node *n) {
   for (c = firstChild(n); c; c = nextSibling(c)) {
     SwigType *type = Getattr(c, "type");
     SwigType *decl = Getattr(c, "decl");
-    type = Copy(type);
-    SwigType_push(type, decl);
-    String *lisp_type;
+    if (type) {
+      type = Copy(type);
+      SwigType_push(type, decl);
+      String *lisp_type;
 
-    if (Strcmp(nodeType(c), "cdecl")) {
-      Printf(stderr, "Structure %s has a slot that we can't deal with.\n", name);
-      Printf(stderr, "nodeType: %s, name: %s, type: %s\n", nodeType(c), Getattr(c, "name"), Getattr(c, "type"));
-      SWIG_exit(EXIT_FAILURE);
+      if (Strcmp(nodeType(c), "cdecl")) {
+	Printf(stderr, "Structure %s has a slot that we can't deal with.\n", name);
+	Printf(stderr, "nodeType: %s, name: %s, type: %s\n", nodeType(c), Getattr(c, "name"), Getattr(c, "type"));
+	SWIG_exit(EXIT_FAILURE);
+      }
+
+      /* Printf(stdout, "Converting %s in %s\n", type, name); */
+      lisp_type = get_ffi_type(n, type, Getattr(c, "sym:name"));
+
+      Printf(f_cl, "  (#.(%s \"%s\" :type :slot) %s)\n", identifier_converter, Getattr(c, "sym:name"), lisp_type);
+
+      Delete(lisp_type);
     }
-
-
-    /* Printf(stdout, "Converting %s in %s\n", type, name); */
-    lisp_type = get_ffi_type(n, type, Getattr(c, "sym:name"));
-
-    Printf(f_cl, "  (#.(%s \"%s\" :type :slot) %s)\n", identifier_converter, Getattr(c, "sym:name"), lisp_type);
-
-    Delete(lisp_type);
   }
 
   // Language::classHandler(n);