bug#31528: patch get-bytevector-n to read more than 4 GB

bug#31528: patch get-bytevector-n to read more than 4 GB

[Jan Šmydke]

[-- Attachment #1.1: Type: text/plain, Size: 495 bytes --]

Hi,

I found

(use-modules (rnrs io ports))

(define v (call-with-input-file "EIVE01.DAT" (lambda (port)
>
  (get-bytevector-n port (* 5 1024 1024 1024)))))
>

fails due to 'out of range':

ERROR: In procedure get-bytevector-n:

ERROR: Value out of range 0 to 4294967295: 52434042880


 The "count" variable was of "unsigned" type (i.e. 32-bit) so I changed it
to "size_t" and the problem is solved.

Enclosed is the corresponding patch (using format-patch)

Jan Šmydke

[-- Attachment #1.2: Type: text/html, Size: 1329 bytes --]

[-- Attachment #2: patch --]
[-- Type: application/octet-stream, Size: 1409 bytes --]

From 5b72b9d9c3cfa40884594eb1d403ec1d2f477d37 Mon Sep 17 00:00:00 2001
From: Jan Smydke <jan.smydke@gmail.com>
Date: Sat, 19 May 2018 12:48:01 +0200
Subject: [PATCH] get-bytevector-n and get-bytevector-n! can now read more than
 4 GB: var "count" changed from unsigned to size_t

---
 libguile/r6rs-ports.c | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/libguile/r6rs-ports.c b/libguile/r6rs-ports.c
index e944c7aab..00eea04a8 100644
--- a/libguile/r6rs-ports.c
+++ b/libguile/r6rs-ports.c
@@ -408,11 +408,11 @@ SCM_DEFINE (scm_get_bytevector_n, "get-bytevector-n", 2, 0, 0,
 #define FUNC_NAME s_scm_get_bytevector_n
 {
   SCM result;
-  unsigned c_count;
+  size_t c_count;
   size_t c_read;
 
   SCM_VALIDATE_BINARY_INPUT_PORT (1, port);
-  c_count = scm_to_uint (count);
+  c_count = scm_to_size_t (count);
 
   result = scm_c_make_bytevector (c_count);
 
@@ -444,13 +444,13 @@ SCM_DEFINE (scm_get_bytevector_n_x, "get-bytevector-n!", 4, 0, 0,
 #define FUNC_NAME s_scm_get_bytevector_n_x
 {
   SCM result;
-  unsigned c_start, c_count, c_len;
+  size_t c_start, c_count, c_len;
   size_t c_read;
 
   SCM_VALIDATE_BINARY_INPUT_PORT (1, port);
   SCM_VALIDATE_BYTEVECTOR (2, bv);
-  c_start = scm_to_uint (start);
-  c_count = scm_to_uint (count);
+  c_start = scm_to_size_t (start);
+  c_count = scm_to_size_t (count);
 
   c_len = SCM_BYTEVECTOR_LENGTH (bv);
 
-- 
2.11.0

bug#31528: patch get-bytevector-n to read more than 4 GB

[Ludovic Courtès]

Hello Jan,

Jan Šmydke <jan.smydke@gmail.com> skribis:

>  The "count" variable was of "unsigned" type (i.e. 32-bit) so I changed it
> to "size_t" and the problem is solved.
>
> Enclosed is the corresponding patch (using format-patch)
>
> Jan Šmydke
> From 5b72b9d9c3cfa40884594eb1d403ec1d2f477d37 Mon Sep 17 00:00:00 2001
> From: Jan Smydke <jan.smydke@gmail.com>
> Date: Sat, 19 May 2018 12:48:01 +0200
> Subject: [PATCH] get-bytevector-n and get-bytevector-n! can now read more than
>  4 GB: var "count" changed from unsigned to size_t
>
> ---
>  libguile/r6rs-ports.c | 10 +++++-----
>  1 file changed, 5 insertions(+), 5 deletions(-)

Awesome.  I adjusted the commit log to match our conventions and
committed.

Thank you!

Ludo’.