NCONF_get_number refix.
authorPauli <paul.dale@oracle.com>
Tue, 3 Jul 2018 23:30:43 +0000 (09:30 +1000)
committerPauli <paul.dale@oracle.com>
Tue, 10 Jul 2018 23:03:22 +0000 (09:03 +1000)
commitc9ecb13191fe902c1e78e3bca7c36c293bba4bc6
tree41187ab74bc9d5c05b2a8df79d6fe2d2b44b3929
parent4431107d6c430950c2c2e19c03b8dff6355ccfdb
NCONF_get_number refix.

Fix the NULL check lack in a different way that is more compatible with
non-NULL branch.  Refer #6632

Also mark and pop the error stack instead of clearing all errors when something
goes awry in CONF_get_number.

Reviewed-by: Rich Salz <rsalz@openssl.org>
Reviewed-by: Andy Polyakov <appro@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/6643)
crypto/conf/conf_err.c
crypto/conf/conf_lib.c
crypto/err/openssl.txt
include/openssl/conferr.h
test/conf_include_test.c