X-Git-Url: https://git.openssl.org/gitweb/?p=openssl.git;a=blobdiff_plain;f=crypto%2Ftxt_db%2Ftxt_db.c;h=34a87e332d8097f9c3716d08d28eda8e2257983e;hp=e4259d976853c61f27f17300a6001e9fa50e2558;hb=a8da89186c447932b9f5abced708330a3bff313b;hpb=9cb0969f657bcc297430fefb9a51e78c52703121;ds=sidebyside

diff --git a/crypto/txt_db/txt_db.c b/crypto/txt_db/txt_db.c
index e4259d9768..34a87e332d 100644
--- a/crypto/txt_db/txt_db.c
+++ b/crypto/txt_db/txt_db.c
@@ -66,7 +66,7 @@
 #undef BUFSIZE
 #define BUFSIZE	512
 
-char *TXT_DB_version="TXT_DB part of OpenSSL 0.9.2 31-Dec-1998";
+char *TXT_DB_version="TXT_DB" OPENSSL_VERSION_PTEXT;
 
 TXT_DB *TXT_DB_read(in,num)
 BIO *in;
@@ -158,7 +158,7 @@ int num;
 		if ((n != num) || (*f != '\0'))
 			{
 #if !defined(NO_STDIO) && !defined(WIN16)	/* temporaty fix :-( */
-			fprintf(stderr,"wrong number of fields on line %ld\n",ln);
+			fprintf(stderr,"wrong number of fields on line %ld (looking for field %d, got %d, '%s' left)\n",ln,num,n,f);
 #endif
 			er=2;
 			goto err;
@@ -356,6 +356,9 @@ TXT_DB *db;
 	int i,n;
 	char **p,*max;
 
+	if(db == NULL)
+	    return;
+
 	if (db->index != NULL)
 		{
 		for (i=db->num_fields-1; i>=0; i--)