scip/pcp
1
0
Fork 0
mirror of https://codeberg.org/scip/pcp.git synced 2025-12-17 20:00:58 +01:00
Code Issues Packages Projects Releases Wiki Activity

merge z85 bugfix#903 from https://github.com/zeromq/libzmq/pull/2322

Browse Source
This commit is contained in:
Thomas von Dein
2017-08-23 13:01:35 +02:00
parent 7e54d27011
commit 48e87fd605
3 changed files with 87 additions and 51 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
libpcp/z85.c
View File

@@ -231,6 +231,9 @@ char *pcp_z85_encode(byte *raw, size_t srclen, size_t *dstlen, int doblock) {
zlen = (outlen * 5 / 4) + 1;
z85 = ucmalloc(zlen + 5); /* plus space for pad blob */
z85 = zmq_z85_encode(z85, padded, outlen);
if (z85 == NULL) {
perror("zmq_z85_encode *z85 failed!");
}
if(srclen %4 != 0)
free(padded);
@@ -239,7 +242,9 @@ char *pcp_z85_encode(byte *raw, size_t srclen, size_t *dstlen, int doblock) {
padblob = ucmalloc(6);
rpad = urmalloc(4);
rpad[3] = (int)padlen;
zmq_z85_encode(padblob, rpad, 4);
if(zmq_z85_encode(padblob, rpad, 4) == NULL) {
perror("zmq_z85_encode *padblob failed!");
}
/* append pad blob to encoded output */
memcpy(&z85[zlen-1], padblob, 5);