xnu-6153.41.3.tar.gz

[apple/xnu.git] / libkern / zlib / zutil.c

diff --git a/libkern/zlib/zutil.c b/libkern/zlib/zutil.c
index 020291bc1bad733a66ebb11fb5d005f0356f457e..81ca65fa4ba757c4a49b508db26889165b9235da 100644 (file)
--- a/libkern/zlib/zutil.c
+++ b/libkern/zlib/zutil.c
@@ -1,8 +1,8 @@
 /*
 /*

- * Copyright (c) 2008 Apple Inc. All rights reserved.
+ * Copyright (c) 2008-2016 Apple Inc. All rights reserved.

  *
  * @APPLE_OSREFERENCE_LICENSE_HEADER_START@
  *
  * @APPLE_OSREFERENCE_LICENSE_HEADER_START@

- * 
+ *

  * This file contains Original Code and/or Modifications of Original Code
  * as defined in and that are subject to the Apple Public Source License
  * Version 2.0 (the 'License'). You may not use this file except in
  * This file contains Original Code and/or Modifications of Original Code
  * as defined in and that are subject to the Apple Public Source License
  * Version 2.0 (the 'License'). You may not use this file except in


@@ -11,10 +11,10 @@
  * unlawful or unlicensed copies of an Apple operating system, or to
  * circumvent, violate, or enable the circumvention or violation of, any
  * terms of an Apple operating system software license agreement.
  * unlawful or unlicensed copies of an Apple operating system, or to
  * circumvent, violate, or enable the circumvention or violation of, any
  * terms of an Apple operating system software license agreement.

- * 
+ *

  * Please obtain a copy of the License at
  * http://www.opensource.apple.com/apsl/ and read it before using this file.
  * Please obtain a copy of the License at
  * http://www.opensource.apple.com/apsl/ and read it before using this file.

- * 
+ *

  * The Original Code and all software distributed under the License are
  * distributed on an 'AS IS' basis, WITHOUT WARRANTY OF ANY KIND, EITHER
  * EXPRESS OR IMPLIED, AND APPLE HEREBY DISCLAIMS ALL SUCH WARRANTIES,
  * The Original Code and all software distributed under the License are
  * distributed on an 'AS IS' basis, WITHOUT WARRANTY OF ANY KIND, EITHER
  * EXPRESS OR IMPLIED, AND APPLE HEREBY DISCLAIMS ALL SUCH WARRANTIES,


@@ -22,7 +22,7 @@
  * FITNESS FOR A PARTICULAR PURPOSE, QUIET ENJOYMENT OR NON-INFRINGEMENT.
  * Please see the License for the specific language governing rights and
  * limitations under the License.
  * FITNESS FOR A PARTICULAR PURPOSE, QUIET ENJOYMENT OR NON-INFRINGEMENT.
  * Please see the License for the specific language governing rights and
  * limitations under the License.

- * 
+ *

  * @APPLE_OSREFERENCE_LICENSE_HEADER_END@
  */
 /* zutil.c -- target dependent utility functions for the compression library
  * @APPLE_OSREFERENCE_LICENSE_HEADER_END@
  */
 /* zutil.c -- target dependent utility functions for the compression library


@@ -146,8 +146,8 @@ uLong ZEXPORT zlibCompileFlags()
 #  endif
 int z_verbose = verbose;
 
 #  endif
 int z_verbose = verbose;
 

-void z_error (m)
-    char *m;
+void
+z_error(char *m)

 {
     fprintf(stderr, "%s\n", m);
     exit(1);
 {
     fprintf(stderr, "%s\n", m);
     exit(1);


@@ -157,8 +157,8 @@ void z_error (m)
 /* exported to allow conversion of error code to string for compress() and
  * uncompress()
  */
 /* exported to allow conversion of error code to string for compress() and
  * uncompress()
  */

-const char * ZEXPORT zError(err)
-    int err;
+const char * ZEXPORT
+zError(int err)

 {
     return ERR_MSG(err);
 }
 {
     return ERR_MSG(err);
 }


@@ -173,10 +173,8 @@ const char * ZEXPORT zError(err)
 
 #ifndef HAVE_MEMCPY
 
 
 #ifndef HAVE_MEMCPY
 

-void zmemcpy(dest, source, len)
-    Bytef* dest;
-    const Bytef* source;
-    uInt  len;
+void
+zmemcpy(Bytef* dest, const Bytef* source, uInt  len)

 {
     if (len == 0) return;
     do {
 {
     if (len == 0) return;
     do {


@@ -184,10 +182,8 @@ void zmemcpy(dest, source, len)
     } while (--len != 0);
 }
 
     } while (--len != 0);
 }
 

-int zmemcmp(s1, s2, len)
-    const Bytef* s1;
-    const Bytef* s2;
-    uInt  len;
+int
+zmemcmp(const Bytef* s1, const Bytef* s2, uInt  len)

 {
     uInt j;
 
 {
     uInt j;
 


@@ -197,9 +193,8 @@ int zmemcmp(s1, s2, len)
     return 0;
 }
 
     return 0;
 }
 

-void zmemzero(dest, len)
-    Bytef* dest;
-    uInt  len;
+void
+zmemzero(Bytef* dest, uInt  len)

 {
     if (len == 0) return;
     do {
 {
     if (len == 0) return;
     do {


@@ -241,7 +236,8 @@ local ptr_table table[MAX_PTR];
  * a protected system like OS/2. Use Microsoft C instead.
  */
 
  * a protected system like OS/2. Use Microsoft C instead.
  */
 

-voidpf zcalloc (voidpf opaque, unsigned items, unsigned size)
+voidpf
+zcalloc(voidpf opaque, unsigned items, unsigned size)

 {
     voidpf buf = opaque; /* just to make some compilers happy */
     ulg bsize = (ulg)items*size;
 {
     voidpf buf = opaque; /* just to make some compilers happy */
     ulg bsize = (ulg)items*size;


@@ -265,7 +261,8 @@ voidpf zcalloc (voidpf opaque, unsigned items, unsigned size)
     return buf;
 }
 
     return buf;
 }
 

-void  zcfree (voidpf opaque, voidpf ptr)
+void
+zcfree(voidpf opaque, voidpf ptr)

 {
     int n;
     if (*(ush*)&ptr != 0) { /* object < 64K */
 {
     int n;
     if (*(ush*)&ptr != 0) { /* object < 64K */


@@ -300,13 +297,15 @@ void  zcfree (voidpf opaque, voidpf ptr)
 #  define _hfree   hfree
 #endif
 
 #  define _hfree   hfree
 #endif
 

-voidpf zcalloc (voidpf opaque, unsigned items, unsigned size)
+voidpf
+zcalloc(voidpf opaque, unsigned items, unsigned size)

 {
     if (opaque) opaque = 0; /* to make compiler happy */
     return _halloc((long)items, size);
 }
 
 {
     if (opaque) opaque = 0; /* to make compiler happy */
     return _halloc((long)items, size);
 }
 

-void  zcfree (voidpf opaque, voidpf ptr)
+void
+zcfree(voidpf opaque, voidpf ptr)

 {
     if (opaque) opaque = 0; /* to make compiler happy */
     _hfree(ptr);
 {
     if (opaque) opaque = 0; /* to make compiler happy */
     _hfree(ptr);


@@ -325,19 +324,23 @@ extern voidp  calloc OF((uInt items, uInt size));
 extern void   free   OF((voidpf ptr));
 #endif
 
 extern void   free   OF((voidpf ptr));
 #endif
 

-voidpf zcalloc (opaque, items, size)
-    voidpf opaque;
-    unsigned items;
-    unsigned size;
+voidpf
+zcalloc(voidpf opaque, unsigned items, unsigned size)

 {
     if (opaque) items += size - size; /* make compiler happy */
 {
     if (opaque) items += size - size; /* make compiler happy */

-    return sizeof(uInt) > 2 ? (voidpf)malloc(items * size) :
-                              (voidpf)calloc(items, size);
+    if (sizeof(uInt) > 2) {
+        /*
+            to prevent use of uninitialized memory, malloc and bzero
+        */
+        voidpf  p = malloc(items * size);
+        bzero(p, items * size); 
+        return p;
+    } else
+        return (voidpf)calloc(items, size);

 }
 
 }
 

-void  zcfree (opaque, ptr)
-    voidpf opaque;
-    voidpf ptr;
+void
+zcfree(voidpf opaque, voidpf ptr)

 {
     free(ptr);
     if (opaque) return; /* make compiler happy */
 {
     free(ptr);
     if (opaque) return; /* make compiler happy */