[cmucl-cvs] [git] CMU Common Lisp branch master updated. snapshot-2011-12-30-ga29c432

[Raymond Toy]

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 "CMU Common Lisp".

The branch, master has been updated
       via  a29c4320d366db73a86dc135a6bcd17ecfb03876 (commit)
       via  d1b0e950b7156f8391a124346a175d95af619dc5 (commit)
      from  31412e299254744d3c7774368065baf2cd494841 (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 a29c4320d366db73a86dc135a6bcd17ecfb03876
Merge: d1b0e95 31412e2
Author: Raymond Toy <rtoy at google.com>
Date:   Wed Jan 4 10:00:32 2012 -0800

    Merge branch 'master' of ssh://common-lisp.net/var/git/projects/cmucl/cmucl


commit d1b0e950b7156f8391a124346a175d95af619dc5
Author: Raymond Toy <rtoy at google.com>
Date:   Wed Jan 4 09:58:14 2012 -0800

    Fix potential write past end of buffer.
    
    We wanted to read one byte into the second byte of "byte", but didn't
    cast everything correctly, so we ended up reading the byte past the
    end of "byte".

diff --git a/src/motif/server/server.c b/src/motif/server/server.c
index 62f6ebd..fe0b224 100644
--- a/src/motif/server/server.c
+++ b/src/motif/server/server.c
@@ -110,7 +110,10 @@ void greet_client(int socket) {
   /* Read byte-swap thing */
   result = read(socket,&byte,2);
   if( !result )  fatal_error("greet_client:  Unable to read initial data.");
-  else if( result == 1 )  read(socket,&byte+1,1);
+  else if( result == 1 ) {
+      result = read(socket, ((char *) &byte)+1,1);
+      fatal_error("greet_client:  Unable to read initial data.");
+  }
 
   swap_bytes = (byte!=1);
   if( global_will_trace ) {

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

Summary of changes:
 src/motif/server/server.c |    5 ++++-
 1 files changed, 4 insertions(+), 1 deletions(-)


hooks/post-receive
-- 
CMU Common Lisp