[Library] Update zlibng (#1255)

* Update zlibng * Set cmake path more directly in zlibng to hopefully fix an issue with the build on drone * I'm dumb, missing / in path * Mackal helps with a dumb gitignore issue * Adding all the files, not sure what's ignoring them and im tired of looking * Some tweaks to zlibng build to hopefully get it to build properly. works on msvc now
2026-09-04 14:36:37 +00:00 · 2021-02-23 17:00:26 -08:00
parent e6dee96266
commit 2957f5084d
184 changed files with 21431 additions and 11703 deletions
@@ -29,98 +29,96 @@ static free_func zfree = NULL;
 * Test deflate() with full flush
 */
 void test_flush(unsigned char *compr, z_size_t *comprLen) {
-  PREFIX3(stream) c_stream; /* compression stream */
-  int err;
-  unsigned int len = dataLen;
+    PREFIX3(stream) c_stream; /* compression stream */
+    int err;
+    unsigned int len = (unsigned int)dataLen;

-  c_stream.zalloc = zalloc;
-  c_stream.zfree = zfree;
-  c_stream.opaque = (void *)0;
+    c_stream.zalloc = zalloc;
+    c_stream.zfree = zfree;
+    c_stream.opaque = (void *)0;

-  err = PREFIX(deflateInit)(&c_stream, Z_DEFAULT_COMPRESSION);
-  CHECK_ERR(err, "deflateInit");
+    err = PREFIX(deflateInit)(&c_stream, Z_DEFAULT_COMPRESSION);
+    CHECK_ERR(err, "deflateInit");

-  c_stream.next_in = (const unsigned char *)data;
-  c_stream.next_out = compr;
-  c_stream.avail_in = 3;
-  c_stream.avail_out = (unsigned int)*comprLen;
-  err = PREFIX(deflate)(&c_stream, Z_FULL_FLUSH);
-  CHECK_ERR(err, "deflate flush 1");
+    c_stream.next_in = (z_const unsigned char *)data;
+    c_stream.next_out = compr;
+    c_stream.avail_in = 3;
+    c_stream.avail_out = (unsigned int)*comprLen;
+    err = PREFIX(deflate)(&c_stream, Z_FULL_FLUSH);
+    CHECK_ERR(err, "deflate flush 1");

-  compr[3]++; /* force an error in first compressed block */
-  c_stream.avail_in = len - 3;
+    compr[3]++; /* force an error in first compressed block */
+    c_stream.avail_in = len - 3;

-  err = PREFIX(deflate)(&c_stream, Z_FINISH);
-  if (err != Z_STREAM_END) {
-    CHECK_ERR(err, "deflate flush 2");
-  }
-  err = PREFIX(deflateEnd)(&c_stream);
-  CHECK_ERR(err, "deflateEnd");
+    err = PREFIX(deflate)(&c_stream, Z_FINISH);
+    if (err != Z_STREAM_END) {
+        CHECK_ERR(err, "deflate flush 2");
+    }
+    err = PREFIX(deflateEnd)(&c_stream);
+    CHECK_ERR(err, "deflateEnd");

-  *comprLen = (z_size_t)c_stream.total_out;
+    *comprLen = (z_size_t)c_stream.total_out;
 }

 /* ===========================================================================
 * Test inflateSync()
 */
-void test_sync(unsigned char *compr, size_t comprLen, unsigned char *uncompr,
-               size_t uncomprLen) {
-  int err;
-  PREFIX3(stream) d_stream; /* decompression stream */
+void test_sync(unsigned char *compr, size_t comprLen, unsigned char *uncompr, size_t uncomprLen) {
+    int err;
+    PREFIX3(stream) d_stream; /* decompression stream */

-  d_stream.zalloc = zalloc;
-  d_stream.zfree = zfree;
-  d_stream.opaque = (void *)0;
+    d_stream.zalloc = zalloc;
+    d_stream.zfree = zfree;
+    d_stream.opaque = (void *)0;

-  d_stream.next_in = compr;
-  d_stream.avail_in = 2; /* just read the zlib header */
+    d_stream.next_in = compr;
+    d_stream.avail_in = 2; /* just read the zlib header */

-  err = PREFIX(inflateInit)(&d_stream);
-  CHECK_ERR(err, "inflateInit");
+    err = PREFIX(inflateInit)(&d_stream);
+    CHECK_ERR(err, "inflateInit");

-  d_stream.next_out = uncompr;
-  d_stream.avail_out = (unsigned int)uncomprLen;
+    d_stream.next_out = uncompr;
+    d_stream.avail_out = (unsigned int)uncomprLen;

-  err = PREFIX(inflate)(&d_stream, Z_NO_FLUSH);
-  CHECK_ERR(err, "inflate");
+    err = PREFIX(inflate)(&d_stream, Z_NO_FLUSH);
+    CHECK_ERR(err, "inflate");

-  d_stream.avail_in = (unsigned int)comprLen - 2; /* read all compressed data */
-  err = PREFIX(inflateSync)(&d_stream); /* but skip the damaged part */
-  CHECK_ERR(err, "inflateSync");
+    d_stream.avail_in = (unsigned int)comprLen - 2; /* read all compressed data */
+    err = PREFIX(inflateSync)(&d_stream); /* but skip the damaged part */
+    CHECK_ERR(err, "inflateSync");

-  err = PREFIX(inflate)(&d_stream, Z_FINISH);
-  if (err != Z_DATA_ERROR) {
-    fprintf(stderr, "inflate should report DATA_ERROR\n");
-    /* Because of incorrect adler32 */
-    exit(1);
-  }
-  err = PREFIX(inflateEnd)(&d_stream);
-  CHECK_ERR(err, "inflateEnd");
+    err = PREFIX(inflate)(&d_stream, Z_FINISH);
+    if (err != Z_STREAM_END) {
+        fprintf(stderr, "inflate should report Z_STREAM_END\n");
+        exit(1);
+    }
+    err = PREFIX(inflateEnd)(&d_stream);
+    CHECK_ERR(err, "inflateEnd");
 }

 int LLVMFuzzerTestOneInput(const uint8_t *d, size_t size) {
-  size_t comprLen = 100 + 2 * PREFIX(compressBound)(size);
-  size_t uncomprLen = size;
-  uint8_t *compr, *uncompr;
+    z_size_t comprLen = 100 + 2 * PREFIX(compressBound)(size);
+    z_size_t uncomprLen = (z_size_t)size;
+    uint8_t *compr, *uncompr;

-  /* Discard inputs larger than 1Mb. */
-  static size_t kMaxSize = 1024 * 1024;
+    /* Discard inputs larger than 1Mb. */
+    static size_t kMaxSize = 1024 * 1024;

-  // This test requires at least 3 bytes of input data.
-  if (size <= 3 || size > kMaxSize)
+    // This test requires at least 3 bytes of input data.
+    if (size <= 3 || size > kMaxSize)
+        return 0;
+
+    data = d;
+    dataLen = size;
+    compr = (uint8_t *)calloc(1, comprLen);
+    uncompr = (uint8_t *)calloc(1, uncomprLen);
+
+    test_flush(compr, &comprLen);
+    test_sync(compr, comprLen, uncompr, uncomprLen);
+
+    free(compr);
+    free(uncompr);
+
+    /* This function must return 0. */
    return 0;
-
-  data = d;
-  dataLen = size;
-  compr = (uint8_t *)calloc(1, comprLen);
-  uncompr = (uint8_t *)calloc(1, uncomprLen);
-
-  test_flush(compr, &comprLen);
-  test_sync(compr, comprLen, uncompr, uncomprLen);
-
-  free(compr);
-  free(uncompr);
-
-  /* This function must return 0. */
-  return 0;
 }