[emacs] initialize kbd_macro_ptr and kbd_macro_end to kdb_macro_buffer
Jan Chaloupka
jchaloup at fedoraproject.org
Tue Aug 5 08:47:53 UTC 2014
commit fd77835c53a20ca5232b47f07e1dc4ca9fb02ec2
Author: Jan Chaloupka <jchaloup at redhat.com>
Date: Tue Aug 5 10:46:49 2014 +0200
initialize kbd_macro_ptr and kbd_macro_end to kdb_macro_buffer
- resolves: #1104012
emacs-24.3-macro.patch | 25 +++++++++++++++++++++++++
emacs.spec | 9 ++++++++-
2 files changed, 33 insertions(+), 1 deletions(-)
---
diff --git a/emacs-24.3-macro.patch b/emacs-24.3-macro.patch
new file mode 100644
index 0000000..57be690
--- /dev/null
+++ b/emacs-24.3-macro.patch
@@ -0,0 +1,25 @@
+From e2261aa685bf67a1596546e7aa05d922d049cb0d Mon Sep 17 00:00:00 2001
+From: Jan Chaloupka <jchaloup at redhat.com>
+Date: Tue, 29 Jul 2014 12:30:07 +0200
+Subject: [PATCH] kbd_macro_ptr and kbd_macro_end of current_kboard initialized to kbd_macro_buffer
+
+---
+ src/macros.c | 2 ++
+ 1 file changed, 2 insertions(+)
+
+diff --git a/src/macros.c b/src/macros.c
+index 1eef9b6..e707784 100644
+--- a/src/macros.c
++++ b/src/macros.c
+@@ -65,6 +65,8 @@ macro before appending to it. */)
+ {
+ current_kboard->kbd_macro_buffer = xmalloc (30 * word_size);
+ current_kboard->kbd_macro_bufsize = 30;
++ current_kboard->kbd_macro_ptr = current_kboard->kbd_macro_buffer;
++ current_kboard->kbd_macro_end = current_kboard->kbd_macro_buffer;
+ }
+ update_mode_lines++;
+ if (NILP (append))
+--
+1.9.3
+
diff --git a/emacs.spec b/emacs.spec
index 362d055..ec174c8 100644
--- a/emacs.spec
+++ b/emacs.spec
@@ -3,7 +3,7 @@ Summary: GNU Emacs text editor
Name: emacs
Epoch: 1
Version: 24.3
-Release: 22%{?dist}
+Release: 23%{?dist}
License: GPLv3+
URL: http://www.gnu.org/software/emacs/
Group: Applications/Editors
@@ -41,6 +41,8 @@ Patch19: emacs-CVE-2014-3422.patch
Patch20: emacs-CVE-2014-3423.patch
Patch21: emacs-CVE-2014-3424.patch
Patch22: emacs-compiled-timestamps.patch
+# BZ1104012, initialize kbd_macro_ptr and kbd_macro_end
+Patch23: emacs-24.3-macro.patch
BuildRequires: atk-devel cairo-devel freetype-devel fontconfig-devel dbus-devel giflib-devel glibc-devel libpng-devel
BuildRequires: libjpeg-devel libtiff-devel libX11-devel libXau-devel libXdmcp-devel libXrender-devel libXt-devel
@@ -190,6 +192,7 @@ packages that add functionality to Emacs.
%patch20 -p1 -b .CVE-2014-3423.patch
%patch21 -p1 -b .CVE-2014-3424.patch
%patch22 -p1 -b .compiled-timestamps
+%patch23 -p1
# We prefer our emacs.desktop file
cp %SOURCE1 etc/emacs.desktop
@@ -472,6 +475,10 @@ update-desktop-database &> /dev/null || :
%dir %{_datadir}/emacs/site-lisp/site-start.d
%changelog
+* Tue Aug 05 2014 jchaloup <jchaloup at redhat.com> - 1:24.3-23
+- resolves: #1104012
+ initialize kbd_macro_ptr and kbd_macro_end to kdb_macro_buffer
+
* Mon Aug 04 2014 Petr Hracek <phracek at redhat.com> - 1:24.3-22
- remove /usr/bin/emacs-nox from install section
More information about the scm-commits
mailing list