diff options
| author | Eli Zaretskii <eliz@gnu.org> | 2016-12-17 13:08:52 +0200 |
|---|---|---|
| committer | Eli Zaretskii <eliz@gnu.org> | 2016-12-17 13:08:52 +0200 |
| commit | 0757b4f2f73daa67e5c5217964b423c6a0239e95 (patch) | |
| tree | abf4bc0accf7a0f0202e9ad88401d2d2ee4796ea /lib | |
| parent | 6bf83218314db1c63ce34564edfb994d9431b28a (diff) | |
| download | emacs-0757b4f2f73daa67e5c5217964b423c6a0239e95.tar.gz | |
Fix crashes on MS-Windows during dumping
* src/unexw32.c (get_section_info): Make extra_bss_size be the
maximum of extra_bss_size and extra_bss_size_static. This avoids
computing the size of the output file smaller than it actually
needs to be, which then causes copy_executable_and_dump_data to
write beyond the requested size of the file mapping, thus relying
on the OS roundup to page boundary to save us from ourselves. See
http://lists.gnu.org/archive/html/emacs-devel/2016-12/msg00642.html
for the details.
* lib/stdio-impl.h: Revert the workaround fix of not including
errno.h for MinGW.
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/stdio-impl.h | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/lib/stdio-impl.h b/lib/stdio-impl.h index 1972a33ab13..766d6936590 100644 --- a/lib/stdio-impl.h +++ b/lib/stdio-impl.h @@ -26,9 +26,7 @@ # include <sys/param.h> #endif -#ifndef __MINGW32__ #include <errno.h> /* For detecting Plan9. */ -#endif #if defined __sferror || defined __DragonFly__ || defined __ANDROID__ /* FreeBSD, NetBSD, OpenBSD, DragonFly, Mac OS X, Cygwin, Android */ |