aboutsummaryrefslogtreecommitdiffstats
path: root/src/pdumper.c
diff options
context:
space:
mode:
authorEli Zaretskii2024-11-12 14:41:01 +0200
committerEli Zaretskii2024-11-12 14:41:01 +0200
commitb54fa15ffbb959e97ea0b77bfeb9ae412a63b4e8 (patch)
tree9b22b5eaa78159a774030478e72370bbcdce2fac /src/pdumper.c
parent6ddbe8c7010485f6bca80b6e898610d5831eac60 (diff)
downloademacs-b54fa15ffbb959e97ea0b77bfeb9ae412a63b4e8.tar.gz
emacs-b54fa15ffbb959e97ea0b77bfeb9ae412a63b4e8.zip
Fix Cygw32 build
* src/pdumper.c (dump_mm_heap_cb_release): Avoid NULL pointer dereference. * src/w32dwrite.c (INITGUID) [CYGWIN]: Don't define for Cygwin. * src/w32menu.c (w32_popup_dialog): Fix Cygw32 build. (Bug#74312)
Diffstat (limited to 'src/pdumper.c')
-rw-r--r--src/pdumper.c11
1 files changed, 7 insertions, 4 deletions
diff --git a/src/pdumper.c b/src/pdumper.c
index c888b659dde..c0b36b1ca44 100644
--- a/src/pdumper.c
+++ b/src/pdumper.c
@@ -4853,11 +4853,14 @@ struct dump_memory_map_heap_control_block
4853static void 4853static void
4854dump_mm_heap_cb_release (struct dump_memory_map_heap_control_block *cb) 4854dump_mm_heap_cb_release (struct dump_memory_map_heap_control_block *cb)
4855{ 4855{
4856 eassert (cb->refcount > 0); 4856 if (cb)
4857 if (--cb->refcount == 0)
4858 { 4857 {
4859 free (cb->mem); 4858 eassert (cb->refcount > 0);
4860 free (cb); 4859 if (--cb->refcount == 0)
4860 {
4861 free (cb->mem);
4862 free (cb);
4863 }
4861 } 4864 }
4862} 4865}
4863 4866