diff options
-rw-r--r-- | ChangeLog | 4 | ||||
-rw-r--r-- | sshbuf.c | 3 |
2 files changed, 6 insertions, 1 deletions
@@ -54,6 +54,10 @@ | |||
54 | [scp.c] | 54 | [scp.c] |
55 | when copying local->remote fails during read, don't send uninitialised | 55 | when copying local->remote fails during read, don't send uninitialised |
56 | heap to the remote end. Reported by Jann Horn | 56 | heap to the remote end. Reported by Jann Horn |
57 | - deraadt@cvs.openbsd.org 2014/06/25 14:16:09 | ||
58 | [sshbuf.c] | ||
59 | unblock SIGSEGV before raising it | ||
60 | ok djm | ||
57 | 61 | ||
58 | 20140618 | 62 | 20140618 |
59 | - (tim) [openssh/session.c] Work around to get chroot sftp working on UnixWare | 63 | - (tim) [openssh/session.c] Work around to get chroot sftp working on UnixWare |
@@ -1,4 +1,4 @@ | |||
1 | /* $OpenBSD: sshbuf.c,v 1.1 2014/04/30 05:29:56 djm Exp $ */ | 1 | /* $OpenBSD: sshbuf.c,v 1.2 2014/06/25 14:16:09 deraadt Exp $ */ |
2 | /* | 2 | /* |
3 | * Copyright (c) 2011 Damien Miller | 3 | * Copyright (c) 2011 Damien Miller |
4 | * | 4 | * |
@@ -53,6 +53,7 @@ sshbuf_check_sanity(const struct sshbuf *buf) | |||
53 | buf->off > buf->size)) { | 53 | buf->off > buf->size)) { |
54 | /* Do not try to recover from corrupted buffer internals */ | 54 | /* Do not try to recover from corrupted buffer internals */ |
55 | SSHBUF_DBG(("SSH_ERR_INTERNAL_ERROR")); | 55 | SSHBUF_DBG(("SSH_ERR_INTERNAL_ERROR")); |
56 | signal(SIGSEGV, SIG_DFL); | ||
56 | raise(SIGSEGV); | 57 | raise(SIGSEGV); |
57 | return SSH_ERR_INTERNAL_ERROR; | 58 | return SSH_ERR_INTERNAL_ERROR; |
58 | } | 59 | } |