diff options
| author | Ludovic Courtès <ludo@gnu.org> | 2017-08-01 15:19:38 +0200 |
|---|---|---|
| committer | Ludovic Courtès <ludo@gnu.org> | 2017-08-01 15:32:07 +0200 |
| commit | 04b6d6f7f7a73e39dcff1e2bca3113ea567e2944 (patch) | |
| tree | c9f9ab3a8c32f7decd9c5b80cfc3f0894d95df6d /gnu/packages/patches/guile-ssh-double-free.patch | |
| parent | 12235a124f7fc56d9cd4eaf76a453cf55d3026ea (diff) | |
| download | gnu-guix-04b6d6f7f7a73e39dcff1e2bca3113ea567e2944.tar gnu-guix-04b6d6f7f7a73e39dcff1e2bca3113ea567e2944.tar.gz | |
gnu: guile-ssh: Update to 0.11.2.
* gnu/packages/ssh.scm (guile-ssh): Update to 0.11.2.
[source]: Remove 'patches', 'modules', and 'snippet'.
* gnu/packages/patches/guile-ssh-channel-finalization.patch,
gnu/packages/patches/guile-ssh-double-free.patch,
gnu/packages/patches/guile-ssh-rexec-bug.patch: Remove.
* gnu/local.mk (dist_patch_DATA): Remove them.
Diffstat (limited to 'gnu/packages/patches/guile-ssh-double-free.patch')
| -rw-r--r-- | gnu/packages/patches/guile-ssh-double-free.patch | 37 |
1 files changed, 0 insertions, 37 deletions
diff --git a/gnu/packages/patches/guile-ssh-double-free.patch b/gnu/packages/patches/guile-ssh-double-free.patch deleted file mode 100644 index 9692b81d39..0000000000 --- a/gnu/packages/patches/guile-ssh-double-free.patch +++ /dev/null @@ -1,37 +0,0 @@ -Fix a double-free or use-after-free issue with Guile-SSH used -with Guile 2.2. See <https://bugs.gnu.org/26976>. - -diff --git a/libguile-ssh/channel-type.c b/libguile-ssh/channel-type.c -index 3dd641f..0839854 100644 ---- a/libguile-ssh/channel-type.c -+++ b/libguile-ssh/channel-type.c -@@ -229,10 +229,11 @@ ptob_close (SCM channel) - ssh_channel_free (ch->ssh_channel); - } - -+ SCM_SETSTREAM (channel, NULL); -+ - #if USING_GUILE_BEFORE_2_2 - scm_gc_free (pt->write_buf, pt->write_buf_size, "port write buffer"); - scm_gc_free (pt->read_buf, pt->read_buf_size, "port read buffer"); -- SCM_SETSTREAM (channel, NULL); - - return 0; - #endif -diff --git a/libguile-ssh/sftp-file-type.c b/libguile-ssh/sftp-file-type.c -index 8879924..f87cf03 100644 ---- a/libguile-ssh/sftp-file-type.c -+++ b/libguile-ssh/sftp-file-type.c -@@ -224,10 +224,11 @@ ptob_close (SCM sftp_file) - sftp_close (fd->file); - } - -+ SCM_SETSTREAM (sftp_file, NULL); -+ - #if USING_GUILE_BEFORE_2_2 - scm_gc_free (pt->write_buf, pt->write_buf_size, "port write buffer"); - scm_gc_free (pt->read_buf, pt->read_buf_size, "port read buffer"); -- SCM_SETSTREAM (sftp_file, NULL); - - return 1; - #endif |