diff options
| author | Ari Roponen | 2010-09-21 21:33:59 +0200 |
|---|---|---|
| committer | Andreas Schwab | 2010-09-21 21:33:59 +0200 |
| commit | 840b985a766f76b61aaa353cba71ce90cb0fc9ed (patch) | |
| tree | d295c1981599271ecf308e3b5867448c48474104 /src | |
| parent | 5bc88f4b8aabaeb99461e7c509129f27b2af4d6c (diff) | |
| download | emacs-840b985a766f76b61aaa353cba71ce90cb0fc9ed.tar.gz emacs-840b985a766f76b61aaa353cba71ce90cb0fc9ed.zip | |
* doc.c (Fsnarf_documentation): Use memmove instead of memcpy as
the regions may overlap.
Diffstat (limited to 'src')
| -rw-r--r-- | src/ChangeLog | 5 | ||||
| -rw-r--r-- | src/doc.c | 2 |
2 files changed, 6 insertions, 1 deletions
diff --git a/src/ChangeLog b/src/ChangeLog index 90e21b7bda9..95c00f38c1f 100644 --- a/src/ChangeLog +++ b/src/ChangeLog | |||
| @@ -1,3 +1,8 @@ | |||
| 1 | 2010-09-21 Ari Roponen <ari.roponen@gmail.com> (tiny change) | ||
| 2 | |||
| 3 | * doc.c (Fsnarf_documentation): Use memmove instead of memcpy as | ||
| 4 | the regions may overlap. | ||
| 5 | |||
| 1 | 2010-09-21 Juanma Barranquero <lekktu@gmail.com> | 6 | 2010-09-21 Juanma Barranquero <lekktu@gmail.com> |
| 2 | 7 | ||
| 3 | * makefile.w32-in ($(BLD)/sysdep.$(O)): Update dependencies. | 8 | * makefile.w32-in ($(BLD)/sysdep.$(O)): Update dependencies. |
| @@ -678,7 +678,7 @@ the same file name is found in the `doc-directory'. */) | |||
| 678 | } | 678 | } |
| 679 | pos += end - buf; | 679 | pos += end - buf; |
| 680 | filled -= end - buf; | 680 | filled -= end - buf; |
| 681 | memcpy (buf, end, filled); | 681 | memmove (buf, end, filled); |
| 682 | } | 682 | } |
| 683 | emacs_close (fd); | 683 | emacs_close (fd); |
| 684 | return Qnil; | 684 | return Qnil; |