aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorWerner Koch <[email protected]>2015-02-12 17:54:17 +0000
committerWerner Koch <[email protected]>2015-02-12 17:54:17 +0000
commit8da836e76f1349f4587d1bb74864b11dde7b8a39 (patch)
tree06a8ce65db50a09444a336abc17447f77a3a13c7
parentgpg: Fix a NULL-deref due to empty ring trust packets. (diff)
downloadgnupg-8da836e76f1349f4587d1bb74864b11dde7b8a39.tar.gz
gnupg-8da836e76f1349f4587d1bb74864b11dde7b8a39.zip
gpg: Fix a NULL-deref in export due to invalid packet lengths.
* g10/build-packet.c (write_fake_data): Take care of a NULL stored as opaque MPI. -- Reported-by: Hanno Böck <[email protected]> (back ported from commit 0835d2f44ef62eab51fce6a927908f544e01cf8f)
-rw-r--r--g10/build-packet.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/g10/build-packet.c b/g10/build-packet.c
index 2e6dfc026..538f2fe13 100644
--- a/g10/build-packet.c
+++ b/g10/build-packet.c
@@ -220,7 +220,8 @@ write_fake_data (IOBUF out, gcry_mpi_t a)
void *p;
p = gcry_mpi_get_opaque ( a, &n );
- iobuf_write (out, p, (n+7)/8 );
+ if (p)
+ iobuf_write (out, p, (n+7)/8 );
}
}