changeset 1:cfcae2ef1c2b

Fixes from upstream.
author Matti Hamalainen <ccr@tnsp.org>
date Tue, 24 Feb 2015 18:54:50 +0200
parents 4410c9c7750d
children ec2f8f6f1dc9
files label.c scan.c
diffstat 2 files changed, 3 insertions(+), 2 deletions(-) [+]
line wrap: on
line diff
--- a/label.c	Tue Feb 24 18:53:52 2015 +0200
+++ b/label.c	Tue Feb 24 18:54:50 2015 +0200
@@ -40,7 +40,7 @@
 #include "opcodes.h"
 
 label *labeltable;
-char defaultlabel[5];
+char defaultlabel[6];
 unsigned numLabels = 0;
 
 #ifndef __STDC__
@@ -55,7 +55,7 @@
   label *entry;
   char *buffer;
 
-  if (!((buffer = malloc (strlen (name)))))
+  if (!((buffer = malloc (strlen (name) + 1))))
     return;
 
   entry = numLabels ?
--- a/scan.c	Tue Feb 24 18:53:52 2015 +0200
+++ b/scan.c	Tue Feb 24 18:54:50 2015 +0200
@@ -597,6 +597,7 @@
 			(unsigned int)entry->address);
 		return 1;
 	}
+    entry = FindNextEntryType (NULL, ~0, RTN_SURE);
     DeleteEntry (entry);
   }