diff options
| author | Werner Koch <[email protected]> | 2015-02-22 04:10:29 +0000 |
|---|---|---|
| committer | Werner Koch <[email protected]> | 2015-02-23 09:45:21 +0000 |
| commit | 68f260f77a9e4f5cacf0a58e4f55ddee125d3f00 (patch) | |
| tree | ce946da7cefc030282f1a774adbe65aea795d928 | |
| parent | gpg: Fix a NULL-deref due to empty ring trust packets. (diff) | |
| download | gnupg-68f260f77a9e4f5cacf0a58e4f55ddee125d3f00.tar.gz gnupg-68f260f77a9e4f5cacf0a58e4f55ddee125d3f00.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)
[dkg: rebased to STABLE-BRANCH-1-4]
Signed-off-by: Daniel Kahn Gillmor <[email protected]>
| -rw-r--r-- | g10/build-packet.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/g10/build-packet.c b/g10/build-packet.c index abe018115..499dd68db 100644 --- a/g10/build-packet.c +++ b/g10/build-packet.c @@ -193,7 +193,8 @@ write_fake_data( IOBUF out, MPI a ) void *p; p = mpi_get_opaque( a, &i ); - iobuf_write( out, p, i ); + if (p) + iobuf_write( out, p, i ); } } |