aboutsummaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorGlenn Morris2013-05-07 15:15:08 -0400
committerGlenn Morris2013-05-07 15:15:08 -0400
commit15acfe419fe1ca82c0a806c600a7e6d000cd56a5 (patch)
tree8b2f87dec728cb4d74ebc152abfa51185413c41c /src
parent54c57cc6c7d1f77933ccaed32284aabecfa4a7c8 (diff)
downloademacs-15acfe419fe1ca82c0a806c600a7e6d000cd56a5.tar.gz
emacs-15acfe419fe1ca82c0a806c600a7e6d000cd56a5.zip
* src/lread.c (readchar): Don't read from a dead buffer. (Bug#14280)
Diffstat (limited to 'src')
-rw-r--r--src/ChangeLog4
-rw-r--r--src/lread.c3
2 files changed, 7 insertions, 0 deletions
diff --git a/src/ChangeLog b/src/ChangeLog
index 4b71eed9c21..cfa10f7bfb2 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,7 @@
12013-05-07 Glenn Morris <rgm@gnu.org>
2
3 * lread.c (readchar): Don't read from a dead buffer. (Bug#14280)
4
12013-05-07 Jan Djärv <jan.h.d@swipnet.se> 52013-05-07 Jan Djärv <jan.h.d@swipnet.se>
2 6
3 * xfns.c: Move misplaced ifndef USE_GTK from previous checkin. 7 * xfns.c: Move misplaced ifndef USE_GTK from previous checkin.
diff --git a/src/lread.c b/src/lread.c
index 1a8a57e57a7..272f252cf7b 100644
--- a/src/lread.c
+++ b/src/lread.c
@@ -201,6 +201,9 @@ readchar (Lisp_Object readcharfun, bool *multibyte)
201 201
202 ptrdiff_t pt_byte = BUF_PT_BYTE (inbuffer); 202 ptrdiff_t pt_byte = BUF_PT_BYTE (inbuffer);
203 203
204 if (! BUFFER_LIVE_P (inbuffer))
205 return -1;
206
204 if (pt_byte >= BUF_ZV_BYTE (inbuffer)) 207 if (pt_byte >= BUF_ZV_BYTE (inbuffer))
205 return -1; 208 return -1;
206 209