From 69b8d1ab13473f851f8957e2bb6f5486f64612ad Mon Sep 17 00:00:00 2001
From: Guilherme Andrade <g@gandrade.net>
Date: Sat, 23 Jul 2016 19:10:10 +0100
Subject: zlib: support extraction of inflation dictionary

---
 erts/emulator/drivers/common/zlib_drv.c | 51 +++++++++++++++++++++++----------
 1 file changed, 36 insertions(+), 15 deletions(-)

(limited to 'erts/emulator')

diff --git a/erts/emulator/drivers/common/zlib_drv.c b/erts/emulator/drivers/common/zlib_drv.c
index 440ba956d8..acbe675c41 100644
--- a/erts/emulator/drivers/common/zlib_drv.c
+++ b/erts/emulator/drivers/common/zlib_drv.c
@@ -44,30 +44,34 @@
 #define INFLATE_INIT    8
 #define INFLATE_INIT2   9
 #define INFLATE_SETDICT 10
-#define INFLATE_SYNC    11
-#define INFLATE_RESET   12
-#define INFLATE_END     13
-#define INFLATE         14
+#define INFLATE_GETDICT 11
+#define INFLATE_SYNC    12
+#define INFLATE_RESET   13
+#define INFLATE_END     14
+#define INFLATE         15
 
-#define CRC32_0         15
-#define CRC32_1         16
-#define CRC32_2         17
+#define CRC32_0         16
+#define CRC32_1         17
+#define CRC32_2         18
 
-#define SET_BUFSZ       18
-#define GET_BUFSZ       19
-#define GET_QSIZE       20
+#define SET_BUFSZ       19
+#define GET_BUFSZ       20
+#define GET_QSIZE       21
 
-#define ADLER32_1       21
-#define ADLER32_2       22
+#define ADLER32_1       22
+#define ADLER32_2       23
 
-#define CRC32_COMBINE   23
-#define ADLER32_COMBINE 24
+#define CRC32_COMBINE   24
+#define ADLER32_COMBINE 25
 
-#define INFLATE_CHUNK   25
+#define INFLATE_CHUNK   26
 
 
 #define DEFAULT_BUFSZ   4000
 
+/* According to zlib documentation, it can never exceed this */
+#define INFL_DICT_SZ    32768
+
 /* This flag is used in the same places, where zlib return codes
  * (Z_OK, Z_STREAM_END, Z_NEED_DICT) are. So, we need to set it to
  * relatively large value to avoid possible value clashes in future.
@@ -248,6 +252,18 @@ static int zlib_output(ZLibData* d)
     return zlib_output_init(d);
 }
 
+static int zlib_inflate_get_dictionary(ZLibData* d)
+{
+    ErlDrvBinary* dbin = driver_alloc_binary(INFL_DICT_SZ);
+    uInt dlen = 0;
+    int res = inflateGetDictionary(&d->s, (unsigned char*)dbin->orig_bytes, &dlen);
+    if ((res == Z_OK) && (driver_output_binary(d->port, NULL, 0, dbin, 0, dlen) < 0)) {
+        res = Z_ERRNO;
+    }
+    driver_free_binary(dbin);
+    return res;
+}
+
 static int zlib_inflate(ZLibData* d, int flush)
 {
     int res = Z_OK;
@@ -586,6 +602,11 @@ static ErlDrvSSizeT zlib_ctl(ErlDrvData drv_data, unsigned int command, char *bu
 	res = inflateSetDictionary(&d->s, (unsigned char*)buf, len);
 	return zlib_return(res, rbuf, rlen);
 
+    case INFLATE_GETDICT:
+        if (d->state != ST_INFLATE) goto badarg;
+        res = zlib_inflate_get_dictionary(d);
+        return zlib_return(res, rbuf, rlen);
+
     case INFLATE_SYNC:
 	if (d->state != ST_INFLATE) goto badarg;
 	if (len != 0) goto badarg;
-- 
cgit v1.2.3


From 640c988fd41f9709b494554b2e5ef1f06f06957e Mon Sep 17 00:00:00 2001
From: Guilherme Andrade <g@gandrade.net>
Date: Sat, 20 Aug 2016 20:59:20 +0100
Subject: zlib: Only link inflateGetDictionary if available

Which at the moment means zlib versions >= 1.2.8.
---
 erts/emulator/drivers/common/zlib_drv.c | 7 +++++++
 1 file changed, 7 insertions(+)

(limited to 'erts/emulator')

diff --git a/erts/emulator/drivers/common/zlib_drv.c b/erts/emulator/drivers/common/zlib_drv.c
index acbe675c41..066cf87c9d 100644
--- a/erts/emulator/drivers/common/zlib_drv.c
+++ b/erts/emulator/drivers/common/zlib_drv.c
@@ -252,6 +252,7 @@ static int zlib_output(ZLibData* d)
     return zlib_output_init(d);
 }
 
+#ifdef HAVE_ZLIB_INFLATEGETDICTIONARY
 static int zlib_inflate_get_dictionary(ZLibData* d)
 {
     ErlDrvBinary* dbin = driver_alloc_binary(INFL_DICT_SZ);
@@ -263,6 +264,7 @@ static int zlib_inflate_get_dictionary(ZLibData* d)
     driver_free_binary(dbin);
     return res;
 }
+#endif
 
 static int zlib_inflate(ZLibData* d, int flush)
 {
@@ -603,9 +605,14 @@ static ErlDrvSSizeT zlib_ctl(ErlDrvData drv_data, unsigned int command, char *bu
 	return zlib_return(res, rbuf, rlen);
 
     case INFLATE_GETDICT:
+#ifdef HAVE_ZLIB_INFLATEGETDICTIONARY
         if (d->state != ST_INFLATE) goto badarg;
         res = zlib_inflate_get_dictionary(d);
         return zlib_return(res, rbuf, rlen);
+#else
+        errno = ENOTSUP;
+        return zlib_return(Z_ERRNO, rbuf, rlen);
+#endif
 
     case INFLATE_SYNC:
 	if (d->state != ST_INFLATE) goto badarg;
-- 
cgit v1.2.3