diff options
| author | Marius Bakke <mbakke@fastmail.com> | 2017-08-26 15:34:29 +0200 |
|---|---|---|
| committer | Marius Bakke <mbakke@fastmail.com> | 2017-08-26 15:34:29 +0200 |
| commit | 4028fd395e6d7f80f7bbeb4ff616b6b89b0bf654 (patch) | |
| tree | 17bac0c3211a872d3a0292cae20347718ecdd5f7 /gnu/packages/patches/guile-ssh-double-free.patch | |
| parent | 9d1cc6bc69d53bf8ad45ac94bc3c268125f86359 (diff) | |
| parent | 72e2815d18ad688b0a16ce3b3efba1172423cec4 (diff) | |
Merge branch 'master' into staging
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 |