aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorArnold D. Robbins <arnold@skeeve.com>2017-01-16 20:57:25 +0200
committerArnold D. Robbins <arnold@skeeve.com>2017-01-16 20:57:25 +0200
commit779fea594a8823c53b3600fa98f75ed9e660b879 (patch)
treee9f236a8a881b7ea139325a994dcd2e961a1e292
parentb16dd7ad0af13d337fdcb36d9d59acf303804fcb (diff)
parentc04fec1b8c96e2b11d451fc45cfd1cf38420310f (diff)
downloadegawk-779fea594a8823c53b3600fa98f75ed9e660b879.tar.gz
egawk-779fea594a8823c53b3600fa98f75ed9e660b879.tar.bz2
egawk-779fea594a8823c53b3600fa98f75ed9e660b879.zip
Merge branch 'master' into feature/fix-comments
-rw-r--r--support/ChangeLog4
-rw-r--r--support/dfa.c3
2 files changed, 6 insertions, 1 deletions
diff --git a/support/ChangeLog b/support/ChangeLog
index 67b07877..e3af1428 100644
--- a/support/ChangeLog
+++ b/support/ChangeLog
@@ -1,3 +1,7 @@
+2017-01-16 Arnold D. Robbins <arnold@skeeve.com>
+
+ * dfa.c: Sync with GNULIB.
+
2017-01-10 Arnold D. Robbins <arnold@skeeve.com>
* dfa.c: Sync with GNULIB.
diff --git a/support/dfa.c b/support/dfa.c
index 1abc6d13..eb8e2136 100644
--- a/support/dfa.c
+++ b/support/dfa.c
@@ -2046,8 +2046,9 @@ copy (position_set const *src, position_set *dst)
dst->elems = xpalloc (NULL, &dst->alloc, src->nelem - dst->alloc, -1,
sizeof *dst->elems);
}
- memcpy (dst->elems, src->elems, src->nelem * sizeof *dst->elems);
dst->nelem = src->nelem;
+ if (src->nelem != 0)
+ memcpy (dst->elems, src->elems, src->nelem * sizeof *dst->elems);
}
static void