[Guile-commits] GNU Guile branch, master, updated. release_1-9-14-111-g4914fe1

[Ludovic Courtès]

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "GNU Guile".

http://git.savannah.gnu.org/cgit/guile.git/commit/?id=4914fe1963ce5bee2ecd86f3a386dd0e23d3678b

The branch, master has been updated
       via  4914fe1963ce5bee2ecd86f3a386dd0e23d3678b (commit)
       via  a7ea441163ea1fc096c09070cecf452031b4a00d (commit)
      from  90cfcf8fa7a0db1b6b84f2dba4f909c95e93c463 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit 4914fe1963ce5bee2ecd86f3a386dd0e23d3678b
Author: Ludovic Courtès <address@hidden>
Date:   Thu Jan 27 00:16:54 2011 +0100

    Use `scm_from_latin1_stringn' in `objcodes.c'.
    
    * libguile/objcodes.c (make_objcode_by_mmap): Use
      `scm_from_latin1_stringn', not `scm_from_locale_stringn', to display
      the invalid cookie in the error case.

commit a7ea441163ea1fc096c09070cecf452031b4a00d
Author: Ludovic Courtès <address@hidden>
Date:   Thu Jan 27 00:15:58 2011 +0100

    Fix buffer overflow in `read-line'.
    
    * libguile/rdelim.c (SCM_DEFINE): Compare INDEX to LINE_BUFFER_SIZE, not
      `sizeof (buf)'.

-----------------------------------------------------------------------

Summary of changes:
 libguile/objcodes.c |    4 ++--
 libguile/rdelim.c   |    2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/libguile/objcodes.c b/libguile/objcodes.c
index 5f3079c..68035f5 100644
--- a/libguile/objcodes.c
+++ b/libguile/objcodes.c
@@ -1,4 +1,4 @@
-/* Copyright (C) 2001, 2009, 2010 Free Software Foundation, Inc.
+/* Copyright (C) 2001, 2009, 2010, 2011 Free Software Foundation, Inc.
  * 
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Lesser General Public License
@@ -79,7 +79,7 @@ make_objcode_by_mmap (int fd)
 
   if (memcmp (addr, SCM_OBJCODE_COOKIE, strlen (SCM_OBJCODE_COOKIE)))
     {
-      SCM args = scm_list_1 (scm_from_locale_stringn
+      SCM args = scm_list_1 (scm_from_latin1_stringn
                              (addr, strlen (SCM_OBJCODE_COOKIE)));
       (void) close (fd);
       (void) munmap (addr, st.st_size);
diff --git a/libguile/rdelim.c b/libguile/rdelim.c
index 760aa47..9d14967 100644
--- a/libguile/rdelim.c
+++ b/libguile/rdelim.c
@@ -139,7 +139,7 @@ SCM_DEFINE (scm_read_line, "%read-line", 0, 1, 0,
 
   do
     {
-      if (SCM_UNLIKELY (index >= sizeof (buf)))
+      if (SCM_UNLIKELY (index >= LINE_BUFFER_SIZE))
        {
          /* The line is getting longer than BUF so store its current
             contents in STRINGS.  */


hooks/post-receive
-- 
GNU Guile