diff options
| author | jmagne <jmagne@c9f7a03b-bd48-0410-a16d-cbbf54688b0b> | 2010-08-19 22:15:04 +0000 |
|---|---|---|
| committer | jmagne <jmagne@c9f7a03b-bd48-0410-a16d-cbbf54688b0b> | 2010-08-19 22:15:04 +0000 |
| commit | dc30e87a3e08ee941c4c2745ee7fcbc8ae25df21 (patch) | |
| tree | a241750f0ee42f93364a315e9a8a2c48c53ed89d | |
| parent | 523177f897da47b82ab7cd5041edb4d1573563e5 (diff) | |
| download | pki-dc30e87a3e08ee941c4c2745ee7fcbc8ae25df21.tar.gz pki-dc30e87a3e08ee941c4c2745ee7fcbc8ae25df21.tar.xz pki-dc30e87a3e08ee941c4c2745ee7fcbc8ae25df21.zip | |
Fix Bug 622535 - 64 bit host zlib uncompress operation fails when reading data from token.
git-svn-id: svn+ssh://svn.fedorahosted.org/svn/pki/trunk@1229 c9f7a03b-bd48-0410-a16d-cbbf54688b0b
| -rw-r--r-- | pki/base/tps/src/main/PKCS11Obj.cpp | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/pki/base/tps/src/main/PKCS11Obj.cpp b/pki/base/tps/src/main/PKCS11Obj.cpp index 62182c501..061dc7a91 100644 --- a/pki/base/tps/src/main/PKCS11Obj.cpp +++ b/pki/base/tps/src/main/PKCS11Obj.cpp @@ -79,11 +79,13 @@ PKCS11Obj *PKCS11Obj::Parse(Buffer *b, int offset) #define MAX_UNCOMPRESS_SIZE 20000 unsigned char buf[MAX_UNCOMPRESS_SIZE]; - int len = MAX_UNCOMPRESS_SIZE; - uncompress((Bytef*)buf, (uLongf*)&len, + int rc = 0; + uLong len = MAX_UNCOMPRESS_SIZE; + rc = uncompress((Bytef*)buf, (uLongf*)&len, (Bytef*)((BYTE*)compressedData), (uLong)compressedData.size()); - data = Buffer(buf, len); + RA::Debug("PKCS11Obj::Parse","uncompress ret=%d",rc); + data = Buffer(buf,(unsigned int) len); } else { /* error */ } |