From 4c6532fa865f38383c75949912e80b64803015c7 Mon Sep 17 00:00:00 2001
From: doug <>
Date: Sun, 19 Jul 2015 01:07:40 +0000
Subject: Assign p to CBS_data since it is used later.
The p initialization was hiding this bug but Coverity 126279 saw it.
ok miod@ bcook@ beck@
---
src/lib/libssl/d1_pkt.c | 5 +++--
src/lib/libssl/src/ssl/d1_pkt.c | 5 +++--
2 files changed, 6 insertions(+), 4 deletions(-)
(limited to 'src')
diff --git a/src/lib/libssl/d1_pkt.c b/src/lib/libssl/d1_pkt.c
index b26ff2cec2..c3574b43bd 100644
--- a/src/lib/libssl/d1_pkt.c
+++ b/src/lib/libssl/d1_pkt.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: d1_pkt.c,v 1.45 2015/07/18 23:00:23 doug Exp $ */
+/* $OpenBSD: d1_pkt.c,v 1.46 2015/07/19 01:07:40 doug Exp $ */
/*
* DTLS implementation written by Nagendra Modadugu
* (nagendra@cs.stanford.edu) for the OpenSSL project 2005.
@@ -492,7 +492,7 @@ again:
/* check if we have the header */
if ((s->rstate != SSL_ST_READ_BODY) ||
- (s->packet_length < DTLS1_RT_HEADER_LENGTH)) {
+ (s->packet_length < DTLS1_RT_HEADER_LENGTH)) {
CBS header, seq_no;
uint16_t epoch, len, ssl_version;
uint8_t type;
@@ -544,6 +544,7 @@ again:
goto again;
/* now s->rstate == SSL_ST_READ_BODY */
+ p = (unsigned char *)CBS_data(&header);
}
/* s->rstate == SSL_ST_READ_BODY, get and decode the data */
diff --git a/src/lib/libssl/src/ssl/d1_pkt.c b/src/lib/libssl/src/ssl/d1_pkt.c
index b26ff2cec2..c3574b43bd 100644
--- a/src/lib/libssl/src/ssl/d1_pkt.c
+++ b/src/lib/libssl/src/ssl/d1_pkt.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: d1_pkt.c,v 1.45 2015/07/18 23:00:23 doug Exp $ */
+/* $OpenBSD: d1_pkt.c,v 1.46 2015/07/19 01:07:40 doug Exp $ */
/*
* DTLS implementation written by Nagendra Modadugu
* (nagendra@cs.stanford.edu) for the OpenSSL project 2005.
@@ -492,7 +492,7 @@ again:
/* check if we have the header */
if ((s->rstate != SSL_ST_READ_BODY) ||
- (s->packet_length < DTLS1_RT_HEADER_LENGTH)) {
+ (s->packet_length < DTLS1_RT_HEADER_LENGTH)) {
CBS header, seq_no;
uint16_t epoch, len, ssl_version;
uint8_t type;
@@ -544,6 +544,7 @@ again:
goto again;
/* now s->rstate == SSL_ST_READ_BODY */
+ p = (unsigned char *)CBS_data(&header);
}
/* s->rstate == SSL_ST_READ_BODY, get and decode the data */
--
cgit v1.2.3-55-g6feb