summaryrefslogtreecommitdiff
path: root/lisp
diff options
context:
space:
mode:
authorDaniel Colascione <dancol@dancol.org>2014-03-21 20:04:24 -0700
committerDaniel Colascione <dancol@dancol.org>2014-03-21 20:04:24 -0700
commitea64063f079e31f824de1f471074c69281fb06fd (patch)
tree16f9e845a7345ce66c03c73408d323de5e7ea24f /lisp
parentaa4659075414a2730535eeb419847d761eb76f0d (diff)
downloademacs-ea64063f079e31f824de1f471074c69281fb06fd.tar.gz
Do not read unitialized memory in conv_sockaddr_to_lisp
Diffstat (limited to 'lisp')
-rw-r--r--lisp/ChangeLog5
-rw-r--r--lisp/mail/emacsbug.el4
2 files changed, 9 insertions, 0 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index b35264cdf6b..214807697e1 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,8 @@
+2014-03-21 Daniel Colascione <dancol@dancol.org>
+
+ * mail/emacsbug.el (report-emacs-bug): Include memory usage
+ information in bug reports.
+
2014-03-21 Glenn Morris <rgm@gnu.org>
* Makefile.in ($(MH_E_DIR)/mh-loaddefs.el)
diff --git a/lisp/mail/emacsbug.el b/lisp/mail/emacsbug.el
index 0f72d24ed1e..b994949e94d 100644
--- a/lisp/mail/emacsbug.el
+++ b/lisp/mail/emacsbug.el
@@ -322,6 +322,10 @@ usually do not have translators for other languages.\n\n")))
shadows)))
(insert (format "\nFeatures:\n%s\n" features))
(fill-region (line-beginning-position 0) (point))
+
+ (insert (format "\nMemory information:\n"))
+ (pp (garbage-collect) (current-buffer))
+
;; This is so the user has to type something in order to send easily.
(use-local-map (nconc (make-sparse-keymap) (current-local-map)))
(define-key (current-local-map) "\C-c\C-i" 'info-emacs-bug)