[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PATCH 1/4] Fix missing port-table locking and bytevector output port se
From: |
Andreas Rottmann |
Subject: |
[PATCH 1/4] Fix missing port-table locking and bytevector output port segfault |
Date: |
Sat, 20 Nov 2010 18:40:30 +0100 |
* libguile/r6rs-ports.c (make_bip, make_cbip, make_bop, make_cbop): Lock
the port table.
* libguile/r6rs-ports.c (make_bop): Let the returned extraction
procedure refer to the port's buffer instead of the port itself. This
fixes a segfault if the port is closed before the extraction procedure
is called.
(bop_proc_apply): Adapt accordingly.
* test-suite/tests/r6rs-ports.test (8.2.10 Output ports): Add testcase
for extraction after close.
---
libguile/r6rs-ports.c | 26 ++++++++++++++++++++------
test-suite/tests/r6rs-ports.test | 8 ++++++++
2 files changed, 28 insertions(+), 6 deletions(-)
diff --git a/libguile/r6rs-ports.c b/libguile/r6rs-ports.c
index 968b329..87aba3d 100644
--- a/libguile/r6rs-ports.c
+++ b/libguile/r6rs-ports.c
@@ -84,6 +84,8 @@ make_bip (SCM bv)
scm_t_port *c_port;
const unsigned long mode_bits = SCM_OPN | SCM_RDNG;
+ scm_i_scm_pthread_mutex_lock (&scm_i_port_table_mutex);
+
port = scm_new_port_table_entry (bytevector_input_port_type);
/* Prevent BV from being GC'd. */
@@ -100,6 +102,8 @@ make_bip (SCM bv)
/* Mark PORT as open, readable and unbuffered (hmm, how elegant...). */
SCM_SET_CELL_TYPE (port, bytevector_input_port_type | mode_bits);
+
+ scm_i_pthread_mutex_unlock (&scm_i_port_table_mutex);
return port;
}
@@ -305,6 +309,8 @@ make_cbip (SCM read_proc, SCM get_position_proc,
SCM_SIMPLE_VECTOR_SET (method_vector, 2, set_position_proc);
SCM_SIMPLE_VECTOR_SET (method_vector, 3, close_proc);
+ scm_i_pthread_mutex_lock (&scm_i_port_table_mutex);
+
port = scm_new_port_table_entry (custom_binary_input_port_type);
/* Attach it the method vector. */
@@ -319,6 +325,8 @@ make_cbip (SCM read_proc, SCM get_position_proc,
/* Mark PORT as open, readable and unbuffered (hmm, how elegant...). */
SCM_SET_CELL_TYPE (port, custom_binary_input_port_type | mode_bits);
+ scm_i_pthread_mutex_unlock (&scm_i_port_table_mutex);
+
return port;
}
@@ -812,6 +820,8 @@ make_bop (void)
scm_t_bop_buffer *buf;
const unsigned long mode_bits = SCM_OPN | SCM_WRTNG;
+ scm_i_pthread_mutex_lock (&scm_i_port_table_mutex);
+
port = scm_new_port_table_entry (bytevector_output_port_type);
buf = (scm_t_bop_buffer *) scm_gc_malloc (sizeof (* buf), SCM_GC_BOP);
@@ -825,11 +835,12 @@ make_bop (void)
/* Mark PORT as open and writable. */
SCM_SET_CELL_TYPE (port, bytevector_output_port_type | mode_bits);
+
+ scm_i_pthread_mutex_unlock (&scm_i_port_table_mutex);
/* Make the bop procedure. */
- SCM_NEWSMOB (bop_proc, bytevector_output_port_procedure,
- SCM_PACK (port));
-
+ SCM_NEWSMOB (bop_proc, bytevector_output_port_procedure, buf);
+
return (scm_values (scm_list_2 (port, bop_proc)));
}
@@ -889,11 +900,10 @@ bop_seek (SCM port, scm_t_off offset, int whence)
SCM_SMOB_APPLY (bytevector_output_port_procedure,
bop_proc_apply, 0, 0, 0, (SCM bop_proc))
{
- SCM port, bv;
+ SCM bv;
scm_t_bop_buffer *buf, result_buf;
- port = SCM_PACK (SCM_SMOB_DATA (bop_proc));
- buf = SCM_BOP_BUFFER (port);
+ buf = (scm_t_bop_buffer *) SCM_SMOB_DATA (bop_proc);
result_buf = *buf;
bop_buffer_init (buf);
@@ -966,6 +976,8 @@ make_cbop (SCM write_proc, SCM get_position_proc,
SCM_SIMPLE_VECTOR_SET (method_vector, 2, set_position_proc);
SCM_SIMPLE_VECTOR_SET (method_vector, 3, close_proc);
+ scm_i_pthread_mutex_lock (&scm_i_port_table_mutex);
+
port = scm_new_port_table_entry (custom_binary_output_port_type);
/* Attach it the method vector. */
@@ -978,6 +990,8 @@ make_cbop (SCM write_proc, SCM get_position_proc,
/* Mark PORT as open, writable and unbuffered. */
SCM_SET_CELL_TYPE (port, custom_binary_output_port_type | mode_bits);
+
+ scm_i_pthread_mutex_unlock (&scm_i_port_table_mutex);
return port;
}
diff --git a/test-suite/tests/r6rs-ports.test b/test-suite/tests/r6rs-ports.test
index 7d80ed7..56ecbb6 100644
--- a/test-suite/tests/r6rs-ports.test
+++ b/test-suite/tests/r6rs-ports.test
@@ -395,6 +395,14 @@
(put-bytevector port source)
(and (bytevector=? (get-content) source)
(bytevector=? (get-content) (make-bytevector 0))))))
+
+ (pass-if "open-bytevector-output-port [extract after close]"
+ (let-values (((port get-content)
+ (open-bytevector-output-port)))
+ (let ((source (make-bytevector 12345 #xFE)))
+ (put-bytevector port source)
+ (close-port port)
+ (bytevector=? (get-content) source))))
(pass-if "open-bytevector-output-port [put-u8]"
(let-values (((port get-content)
--
1.7.2.3
- [PATCH 1/4] Turn `(rnrs io ports)' into an R6RS library, (continued)
- [PATCH 1/4] Turn `(rnrs io ports)' into an R6RS library, Andreas Rottmann, 2010/11/21
- [PATCH 2/4] Reorganize the R6RS I/O condition types, Andreas Rottmann, 2010/11/21
- [PATCH 4/4] Add implementation of "transcoded ports", Andreas Rottmann, 2010/11/21
- Re: [PATCH 4/4] Add implementation of "transcoded ports", Ludovic Courtès, 2010/11/24
- Re: [PATCH 4/4] Add implementation of "transcoded ports", Andreas Rottmann, 2010/11/24
- Re: [PATCH 4/4] Add implementation of "transcoded ports", Ludovic Courtès, 2010/11/25
- [PATCH 3/4] Work towards a more complete implementation of `(rnrs io ports)', Andreas Rottmann, 2010/11/21
- Re: [PATCH 3/4] Work towards a more complete implementation of `(rnrs io ports)', Ludovic Courtès, 2010/11/23
- Re: [PATCH 3/4] Work towards a more complete implementation of `(rnrs io ports)', Andreas Rottmann, 2010/11/23
- Re: [PATCH 3/4] Work towards a more complete implementation of `(rnrs io ports)', Ludovic Courtès, 2010/11/24
[PATCH 1/4] Fix missing port-table locking and bytevector output port segfault,
Andreas Rottmann <=
[PATCH 3/4] Reorganize the R6RS I/O condition types, Andreas Rottmann, 2010/11/20
[PATCH 4/4] Work towards a more complete implementation of `(rnrs io ports)', Andreas Rottmann, 2010/11/20