From 95dd4890cc3667b688f99bf11f13f8b3484b6e82 Mon Sep 17 00:00:00 2001
From: Vitor Santos Costa <vsc@dcc.fc.up.pt>
Date: Sun, 17 Sep 2017 07:58:20 +0100
Subject: [PATCH] cleanup

---
 C/adtdefs.c | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

diff --git a/C/adtdefs.c b/C/adtdefs.c
index 8dbbfd6a5..fed2fd720 100755
--- a/C/adtdefs.c
+++ b/C/adtdefs.c
@@ -178,13 +178,15 @@ LookupAtom(const unsigned char *atom) { /* lookup atom in atom table */
     na = SearchAtom(atom, a);
     if (na != NIL) {
       WRITE_UNLOCK(HashChain[hash].AERWLock);
-      return (na);
+      return na;
     }
   }
 #endif
   /* add new atom to start of chain */
+  size_t asz = strlen((const char *)atom);
+
   ae = (AtomEntry *)Yap_AllocAtomSpace((sizeof *ae) +
-                                       strlen((const char *)atom) + 1);
+   asz+4);
   if (ae == NULL) {
     WRITE_UNLOCK(HashChain[hash].AERWLock);
     return NIL;
@@ -192,13 +194,12 @@ LookupAtom(const unsigned char *atom) { /* lookup atom in atom table */
   NOfAtoms++;
   na = AbsAtom(ae);
   ae->PropsOfAE = NIL;
-  if (ae->UStrOfAE != atom)
-    strcpy((char *)ae->StrOfAE, (const char *)atom);
+  stpncpy((char *)ae->StrOfAE, (const char *)atom, asz+1);
+
   ae->NextOfAE = a;
   HashChain[hash].Entry = na;
   INIT_RWLOCK(ae->ARWLock);
   WRITE_UNLOCK(HashChain[hash].AERWLock);
-
   if (NOfAtoms > 2 * AtomHashTableSize) {
     Yap_signal(YAP_CDOVF_SIGNAL);
   }