0.8.12.7: Merge package locks, AKA "what can go wrong with a 3783 line patch?"

[sbcl.git] / src / code / target-c-call.lisp

diff --git a/src/code/target-c-call.lisp b/src/code/target-c-call.lisp
index d9575b8..3292453 100644 (file)
--- a/src/code/target-c-call.lisp
+++ b/src/code/target-c-call.lisp
@@ -37,11 +37,14 @@
 \f
 (defun %naturalize-c-string (sap)
   (declare (type system-area-pointer sap))
-  (with-alien ((ptr (* char) sap))
-    (let* ((length (alien-funcall (extern-alien "strlen"
-                                               (function integer (* char)))
-                                 ptr))
-          (result (make-string length)))
+  (locally
       (declare (optimize (speed 3) (safety 0)))
-      (sb!kernel:%byte-blt sap 0 result 0 length)
-      result)))
+    (let ((length (loop for offset of-type fixnum upfrom 0
+                        until (zerop (sap-ref-8 sap offset))
+                        finally (return offset))))
+      (let ((result (make-string length :element-type 'base-char)))
+       (sb!kernel:copy-from-system-area sap 0
+                                         result (* sb!vm:vector-data-offset
+                                                   sb!vm:n-word-bits)
+                                         (* length sb!vm:n-byte-bits))
+       result))))