X-Git-Url: https://the.earth.li/gitweb/?a=blobdiff_plain;f=parsekey.c;h=4829e3e934efd73d1068b33991e95f0a59a515b8;hb=c2524e42992138f66a836d6c7ffe725a307c50d2;hp=0f02e8cf757f8839f2fd609c151e7d2202412aec;hpb=576754568dc383e78065e88e05eeb2d078524f9c;p=onak.git

diff --git a/parsekey.c b/parsekey.c
index 0f02e8c..4829e3e 100644
--- a/parsekey.c
+++ b/parsekey.c
@@ -5,7 +5,7 @@
  *
  * Copyright 2002 Project Purple
  *
- * $Id: parsekey.c,v 1.8 2003/06/08 19:04:32 noodles Exp $
+ * $Id: parsekey.c,v 1.10 2003/09/29 07:35:26 noodles Exp $
  */
 
 #include <assert.h>
@@ -219,7 +219,9 @@ int read_openpgp_stream(int (*getchar_func)(void *ctx, size_t count,
 					curpacket->packet->length += 192;
 				} else if (curpacket->packet->length > 223 &&
 					curpacket->packet->length < 255) {
-					printf("Partial length; not supported.\n");
+					logthing(LOGTHING_NOTICE,
+						"Partial length;"
+						" not supported.\n");
 				} else if (curpacket->packet->length == 255) {
 					/*
 					 * 5 byte length; ie 255 followed by 3
@@ -278,9 +280,16 @@ int read_openpgp_stream(int (*getchar_func)(void *ctx, size_t count,
 				curpacket->packet->data =
 					malloc(curpacket->packet->length *
 					sizeof(unsigned char));
-				rc = getchar_func(ctx,
-					curpacket->packet->length,
-					curpacket->packet->data);
+				if (curpacket->packet->data == NULL) {
+					logthing(LOGTHING_ERROR, 
+						"Can't allocate memory for "
+						"packet!");
+					rc = -1;
+				} else {
+					rc = getchar_func(ctx,
+						curpacket->packet->length,
+						curpacket->packet->data);
+				}
 			}
 			inpacket = false;
 		} else {