- djm@cvs.openbsd.org 2010/03/04 01:44:57
[key.c]
use buffer_get_string_ptr_ret() where we are checking the return
value explicitly instead of the fatal()-causing buffer_get_string_ptr()
diff --git a/ChangeLog b/ChangeLog
index 7bd2975..0b5663b 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -18,6 +18,10 @@
- djm@cvs.openbsd.org 2010/03/03 22:50:40
[PROTOCOL.certkeys]
s/similar same/similar/; from imorgan AT nas.nasa.gov
+ - djm@cvs.openbsd.org 2010/03/04 01:44:57
+ [key.c]
+ use buffer_get_string_ptr_ret() where we are checking the return
+ value explicitly instead of the fatal()-causing buffer_get_string_ptr()
20100303
- (djm) [PROTOCOL.certkeys] Add RCS Ident
diff --git a/key.c b/key.c
index e6266fa..0d0c912 100644
--- a/key.c
+++ b/key.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: key.c,v 1.84 2010/03/03 01:44:36 djm Exp $ */
+/* $OpenBSD: key.c,v 1.85 2010/03/04 01:44:57 djm Exp $ */
/*
* read_bignum():
* Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland
@@ -1069,8 +1069,8 @@
buffer_append(&tmp, constraints, clen);
/* validate structure */
while (buffer_len(&tmp) != 0) {
- if (buffer_get_string_ptr(&tmp, NULL) == NULL ||
- buffer_get_string_ptr(&tmp, NULL) == NULL) {
+ if (buffer_get_string_ptr_ret(&tmp, NULL) == NULL ||
+ buffer_get_string_ptr_ret(&tmp, NULL) == NULL) {
error("%s: Constraints data invalid", __func__);
goto out;
}