Changeset 27256 in project

Timestamp:

08/17/12 05:35:50 (9 years ago)

Author:

Jim Ursetto

Message:

socket 0.2.2: socket-receive, socket-send and friends must typecheck socket arg; fixes segfault (reported by hypnocat)

Location:

release/4/socket/trunk

Files:

• socket.scm (modified) (8 diffs)
• socket.setup (modified) (1 diff)

release/4/socket/trunk/socket.scm

@@ -567 +567 @@
 (define-inline (%socket-fileno so)
   (##sys#slot so 1))
+(define-inline (check-socket so loc)
+  (unless (socket? so)
+    (type-error loc "argument is not a socket" so)))
 
 (define-record-printer (socket s out)
@@ -754 +757 @@
                                        "receive buffer must be a blob or a string" so))))
          (end (or end buflen)))
+    (check-socket so 'socket-receive!)
     (##sys#check-exact start)    
     (##sys#check-exact end)
@@ -786 +790 @@
 ;; TODO: Should LEN default to socket-receive-buffer-size ?
 (define (socket-receive so len #!optional (flags 0))
-  (let ((buf (make-string len)))
+  (let ((buf (make-string len)))  ; checks len exact
+    (check-socket so 'socket-receive)
+    (##sys#check-exact flags)
     (let ((n (%socket-receive! so buf 0 len flags (socket-receive-timeout))))
       (if (= len n)
@@ -803 +809 @@
                                        "receive buffer must be a blob or a string" so))))
          (end (or end buflen)))
+    (check-socket so 'socket-receive-from!)
     (##sys#check-exact start)    
     (##sys#check-exact end)
@@ -858 +865 @@
 ;; See TODOs at socket-receive.
 (define (socket-receive-from so len #!optional (flags 0))
-  (let ((buf (make-string len)))
+  (let ((buf (make-string len))) ; checks len exact
+    (check-socket so 'socket-receive-from)
+    (##sys#check-exact flags)
     (let ((R (%socket-receive-from! so buf 0 len flags (socket-receive-timeout))))
       (let ((n (car R)))
@@ -878 +887 @@
                                        "send buffer must be a blob or a string" so))))
          (end (or end buflen)))
+    (check-socket so 'socket-send)
     (##sys#check-exact start)
     (##sys#check-exact end)
@@ -928 +938 @@
                                        "send buffer must be a blob or a string" so))))
          (end (or end buflen)))
+    (check-socket so 'socket-send-all)
     (##sys#check-exact start)
     (##sys#check-exact end)
@@ -948 +959 @@
                                        "send buffer must be a blob or a string" so))))
          (end (or end buflen)))
+    (check-socket so 'socket-send-to)
     (##sys#check-exact start)
     (##sys#check-exact end)

release/4/socket/trunk/socket.setup

@@ -9 +9 @@
  'socket
  '("socket.so" "socket.import.so")
- '((version "0.2.1")))
+ '((version "0.2.2")))