Derive wxWebViewEvent from wxNotifyEvent.

[wxWidgets.git] / src / png / pngmem.c

diff --git a/src/png/pngmem.c b/src/png/pngmem.c
index 02a8e337d1e9777dd389a575b5d4f534efcbd26b..c8a3f6f59af1c9acc6bb176b5aced7d8c3d3508b 100644 (file)
--- a/src/png/pngmem.c
+++ b/src/png/pngmem.c
@@ -1,12 +1,15 @@
 
 /* pngmem.c - stub functions for memory allocation
  *
 
 /* pngmem.c - stub functions for memory allocation
  *

- * libpng 1.2.5rc3 - September 18, 2002
- * For conditions of distribution and use, see copyright notice in png.h
- * Copyright (c) 1998-2002 Glenn Randers-Pehrson
+ * Last changed in libpng 1.4.2 [May 6, 2010]
+ * Copyright (c) 1998-2010 Glenn Randers-Pehrson

  * (Version 0.96 Copyright (c) 1996, 1997 Andreas Dilger)
  * (Version 0.88 Copyright (c) 1995, 1996 Guy Eric Schalnat, Group 42, Inc.)
  *
  * (Version 0.96 Copyright (c) 1996, 1997 Andreas Dilger)
  * (Version 0.88 Copyright (c) 1995, 1996 Guy Eric Schalnat, Group 42, Inc.)
  *

+ * This code is released under the libpng license.
+ * For conditions of distribution and use, see the disclaimer
+ * and license in png.h
+ *

  * This file provides a location for all memory allocation.  Users who
  * need special memory handling are expected to supply replacement
  * functions for png_malloc() and png_free(), and to use
  * This file provides a location for all memory allocation.  Users who
  * need special memory handling are expected to supply replacement
  * functions for png_malloc() and png_free(), and to use


@@ -14,12 +17,14 @@
  * identify the replacement functions.
  */
 
  * identify the replacement functions.
  */
 

-#define PNG_INTERNAL
+#define PNG_NO_PEDANTIC_WARNINGS

 #include "png.h"
 #include "png.h"

+#if defined(PNG_READ_SUPPORTED) || defined(PNG_WRITE_SUPPORTED)
+#include "pngpriv.h"

 
 /* Borland DOS special memory handler */
 #if defined(__TURBOC__) && !defined(_Windows) && !defined(__FLAT__)
 
 /* Borland DOS special memory handler */
 #if defined(__TURBOC__) && !defined(_Windows) && !defined(__FLAT__)

-/* if you change this, be sure to change the one in png.h also */
+/* If you change this, be sure to change the one in png.h also */

 
 /* Allocate memory for a png_struct.  The malloc and memset can be replaced
    by a single call to calloc() if this is thought to improve performance. */
 
 /* Allocate memory for a png_struct.  The malloc and memset can be replaced
    by a single call to calloc() if this is thought to improve performance. */


@@ -27,7 +32,7 @@ png_voidp /* PRIVATE */
 png_create_struct(int type)
 {
 #ifdef PNG_USER_MEM_SUPPORTED
 png_create_struct(int type)
 {
 #ifdef PNG_USER_MEM_SUPPORTED

-   return (png_create_struct_2(type, png_malloc_ptr_NULL, png_voidp_NULL));
+   return (png_create_struct_2(type, NULL, NULL));

 }
 
 /* Alternate version of png_create_struct, for use with user-defined malloc. */
 }
 
 /* Alternate version of png_create_struct, for use with user-defined malloc. */


@@ -39,14 +44,14 @@ png_create_struct_2(int type, png_malloc_ptr malloc_fn, png_voidp mem_ptr)
    png_voidp struct_ptr;
 
    if (type == PNG_STRUCT_INFO)
    png_voidp struct_ptr;
 
    if (type == PNG_STRUCT_INFO)

-     size = sizeof(png_info);
+      size = png_sizeof(png_info);

    else if (type == PNG_STRUCT_PNG)
    else if (type == PNG_STRUCT_PNG)

-     size = sizeof(png_struct);
+      size = png_sizeof(png_struct);

    else
    else

-     return (png_get_copyright());
+      return (png_get_copyright(NULL));

 
 #ifdef PNG_USER_MEM_SUPPORTED
 
 #ifdef PNG_USER_MEM_SUPPORTED

-   if(malloc_fn != NULL)
+   if (malloc_fn != NULL)

    {
       png_struct dummy_struct;
       png_structp png_ptr = &dummy_struct;
    {
       png_struct dummy_struct;
       png_structp png_ptr = &dummy_struct;


@@ -55,7 +60,7 @@ png_create_struct_2(int type, png_malloc_ptr malloc_fn, png_voidp mem_ptr)
    }
    else
 #endif /* PNG_USER_MEM_SUPPORTED */
    }
    else
 #endif /* PNG_USER_MEM_SUPPORTED */

-      struct_ptr = (png_voidp)farmalloc(size));
+   struct_ptr = (png_voidp)farmalloc(size);

    if (struct_ptr != NULL)
       png_memset(struct_ptr, 0, size);
    return (struct_ptr);
    if (struct_ptr != NULL)
       png_memset(struct_ptr, 0, size);
    return (struct_ptr);


@@ -66,7 +71,7 @@ void /* PRIVATE */
 png_destroy_struct(png_voidp struct_ptr)
 {
 #ifdef PNG_USER_MEM_SUPPORTED
 png_destroy_struct(png_voidp struct_ptr)
 {
 #ifdef PNG_USER_MEM_SUPPORTED

-   png_destroy_struct_2(struct_ptr, png_free_ptr_NULL, png_voidp_NULL);
+   png_destroy_struct_2(struct_ptr, NULL, NULL);

 }
 
 /* Free memory allocated by a png_create_struct() call */
 }
 
 /* Free memory allocated by a png_create_struct() call */


@@ -78,7 +83,7 @@ png_destroy_struct_2(png_voidp struct_ptr, png_free_ptr free_fn,
    if (struct_ptr != NULL)
    {
 #ifdef PNG_USER_MEM_SUPPORTED
    if (struct_ptr != NULL)
    {
 #ifdef PNG_USER_MEM_SUPPORTED

-      if(free_fn != NULL)
+      if (free_fn != NULL)

       {
          png_struct dummy_struct;
          png_structp png_ptr = &dummy_struct;
       {
          png_struct dummy_struct;
          png_structp png_ptr = &dummy_struct;


@@ -110,9 +115,19 @@ png_destroy_struct_2(png_voidp struct_ptr, png_free_ptr free_fn,
  * result, we would be truncating potentially larger memory requests
  * (which should cause a fatal error) and introducing major problems.
  */
  * result, we would be truncating potentially larger memory requests
  * (which should cause a fatal error) and introducing major problems.
  */

+png_voidp PNGAPI
+png_calloc(png_structp png_ptr, png_alloc_size_t size)
+{
+   png_voidp ret;
+
+   ret = (png_malloc(png_ptr, size));
+   if (ret != NULL)
+      png_memset(ret,0,(png_size_t)size);
+   return (ret);
+}

 
 png_voidp PNGAPI
 
 png_voidp PNGAPI

-png_malloc(png_structp png_ptr, png_uint_32 size)
+png_malloc(png_structp png_ptr, png_alloc_size_t size)

 {
    png_voidp ret;
 
 {
    png_voidp ret;
 


@@ -120,33 +135,40 @@ png_malloc(png_structp png_ptr, png_uint_32 size)
       return (NULL);
 
 #ifdef PNG_USER_MEM_SUPPORTED
       return (NULL);
 
 #ifdef PNG_USER_MEM_SUPPORTED

-   if(png_ptr->malloc_fn != NULL)
-   {
-       ret = ((png_voidp)(*(png_ptr->malloc_fn))(png_ptr, (png_size_t)size));
-       if (ret == NULL && (png_ptr->flags&PNG_FLAG_MALLOC_NULL_MEM_OK) == 0)
-          png_error(png_ptr, "Out of memory!");
-       return (ret);
-   }
+   if (png_ptr->malloc_fn != NULL)
+      ret = ((png_voidp)(*(png_ptr->malloc_fn))(png_ptr, (png_size_t)size));

    else
    else

-       return png_malloc_default(png_ptr, size);
+      ret = (png_malloc_default(png_ptr, size));
+   if (ret == NULL && (png_ptr->flags&PNG_FLAG_MALLOC_NULL_MEM_OK) == 0)
+       png_error(png_ptr, "Out of memory");
+   return (ret);

 }
 
 png_voidp PNGAPI
 }
 
 png_voidp PNGAPI

-png_malloc_default(png_structp png_ptr, png_uint_32 size)
+png_malloc_default(png_structp png_ptr, png_alloc_size_t size)

 {
    png_voidp ret;
 #endif /* PNG_USER_MEM_SUPPORTED */
 
 {
    png_voidp ret;
 #endif /* PNG_USER_MEM_SUPPORTED */
 

+   if (png_ptr == NULL || size == 0)
+      return (NULL);
+

 #ifdef PNG_MAX_MALLOC_64K
    if (size > (png_uint_32)65536L)
 #ifdef PNG_MAX_MALLOC_64K
    if (size > (png_uint_32)65536L)

-      png_error(png_ptr, "Cannot Allocate > 64K");
+   {
+      png_warning(png_ptr, "Cannot Allocate > 64K");
+      ret = NULL;
+   }
+   else

 #endif
 
 #endif
 

-   if (size == (png_uint_32)65536L)
+   if (size != (size_t)size)
+      ret = NULL;
+   else if (size == (png_uint_32)65536L)

    {
       if (png_ptr->offset_table == NULL)
       {
    {
       if (png_ptr->offset_table == NULL)
       {

-         /* try to see if we need to do any of this fancy stuff */
+         /* Try to see if we need to do any of this fancy stuff */

          ret = farmalloc(size);
          if (ret == NULL || ((png_size_t)ret & 0xffff))
          {
          ret = farmalloc(size);
          if (ret == NULL || ((png_size_t)ret & 0xffff))
          {


@@ -162,7 +184,7 @@ png_malloc_default(png_structp png_ptr, png_uint_32 size)
                ret = NULL;
             }
 
                ret = NULL;
             }
 

-            if(png_ptr->zlib_window_bits > 14)
+            if (png_ptr->zlib_window_bits > 14)

                num_blocks = (int)(1 << (png_ptr->zlib_window_bits - 14));
             else
                num_blocks = 1;
                num_blocks = (int)(1 << (png_ptr->zlib_window_bits - 14));
             else
                num_blocks = 1;


@@ -177,34 +199,40 @@ png_malloc_default(png_structp png_ptr, png_uint_32 size)
 
             if (table == NULL)
             {
 
             if (table == NULL)
             {

-               if (png_ptr->flags&PNG_FLAG_MALLOC_NULL_MEM_OK) == 0)
-                  png_error(png_ptr, "Out Of Memory."); /* Note "O" and "M" */
+#ifndef PNG_USER_MEM_SUPPORTED
+               if ((png_ptr->flags&PNG_FLAG_MALLOC_NULL_MEM_OK) == 0)
+                  png_error(png_ptr, "Out Of Memory"); /* Note "O", "M" */

                else
                else

-                  png_warning(png_ptr, "Out Of Memory.");
+                  png_warning(png_ptr, "Out Of Memory");
+#endif

                return (NULL);
             }
 
             if ((png_size_t)table & 0xfff0)
             {
                return (NULL);
             }
 
             if ((png_size_t)table & 0xfff0)
             {

-               if (png_ptr->flags&PNG_FLAG_MALLOC_NULL_MEM_OK) == 0)
+#ifndef PNG_USER_MEM_SUPPORTED
+               if ((png_ptr->flags&PNG_FLAG_MALLOC_NULL_MEM_OK) == 0)

                   png_error(png_ptr,
                     "Farmalloc didn't return normalized pointer");
                else
                   png_warning(png_ptr,
                     "Farmalloc didn't return normalized pointer");
                   png_error(png_ptr,
                     "Farmalloc didn't return normalized pointer");
                else
                   png_warning(png_ptr,
                     "Farmalloc didn't return normalized pointer");

+#endif

                return (NULL);
             }
 
             png_ptr->offset_table = table;
             png_ptr->offset_table_ptr = farmalloc(num_blocks *
                return (NULL);
             }
 
             png_ptr->offset_table = table;
             png_ptr->offset_table_ptr = farmalloc(num_blocks *

-               sizeof (png_bytep));
+               png_sizeof(png_bytep));

 
             if (png_ptr->offset_table_ptr == NULL)
             {
 
             if (png_ptr->offset_table_ptr == NULL)
             {

-               if (png_ptr->flags&PNG_FLAG_MALLOC_NULL_MEM_OK) == 0)
-                  png_error(png_ptr, "Out Of memory."); /* Note "O" and "M" */
+#ifndef PNG_USER_MEM_SUPPORTED
+               if ((png_ptr->flags&PNG_FLAG_MALLOC_NULL_MEM_OK) == 0)
+                  png_error(png_ptr, "Out Of memory"); /* Note "O", "m" */

                else
                else

-                  png_warning(png_ptr, "Out Of memory.");
+                  png_warning(png_ptr, "Out Of memory");
+#endif

                return (NULL);
             }
 
                return (NULL);
             }
 


@@ -228,10 +256,12 @@ png_malloc_default(png_structp png_ptr, png_uint_32 size)
 
       if (png_ptr->offset_table_count >= png_ptr->offset_table_number)
       {
 
       if (png_ptr->offset_table_count >= png_ptr->offset_table_number)
       {

-         if (png_ptr->flags&PNG_FLAG_MALLOC_NULL_MEM_OK) == 0)
-            png_error(png_ptr, "Out of Memory."); /* Note "o" and "M" */
+#ifndef PNG_USER_MEM_SUPPORTED
+         if ((png_ptr->flags&PNG_FLAG_MALLOC_NULL_MEM_OK) == 0)
+            png_error(png_ptr, "Out of Memory"); /* Note "o" and "M" */

          else
          else

-            png_warning(png_ptr, "Out of Memory.");
+            png_warning(png_ptr, "Out of Memory");
+#endif

          return (NULL);
       }
 
          return (NULL);
       }
 


@@ -240,20 +270,23 @@ png_malloc_default(png_structp png_ptr, png_uint_32 size)
    else
       ret = farmalloc(size);
 
    else
       ret = farmalloc(size);
 

+#ifndef PNG_USER_MEM_SUPPORTED

    if (ret == NULL)
    {
    if (ret == NULL)
    {

-      if (png_ptr->flags&PNG_FLAG_MALLOC_NULL_MEM_OK) == 0)
-         png_error(png_ptr, "Out of memory."); /* Note "o" and "m" */
+      if ((png_ptr->flags&PNG_FLAG_MALLOC_NULL_MEM_OK) == 0)
+         png_error(png_ptr, "Out of memory"); /* Note "o" and "m" */

       else
       else

-         png_warning(png_ptr, "Out of memory."); /* Note "o" and "m" */
+         png_warning(png_ptr, "Out of memory"); /* Note "o" and "m" */

    }
    }

+#endif

 
    return (ret);
 }
 
 
    return (ret);
 }
 

-/* free a pointer allocated by png_malloc().  In the default
-   configuration, png_ptr is not used, but is passed in case it
-   is needed.  If ptr is NULL, return without taking any action. */
+/* Free a pointer allocated by png_malloc().  In the default
+ * configuration, png_ptr is not used, but is passed in case it
+ * is needed.  If ptr is NULL, return without taking any action.
+ */

 void PNGAPI
 png_free(png_structp png_ptr, png_voidp ptr)
 {
 void PNGAPI
 png_free(png_structp png_ptr, png_voidp ptr)
 {


@@ -266,7 +299,8 @@ png_free(png_structp png_ptr, png_voidp ptr)
       (*(png_ptr->free_fn))(png_ptr, ptr);
       return;
    }
       (*(png_ptr->free_fn))(png_ptr, ptr);
       return;
    }

-   else png_free_default(png_ptr, ptr);
+   else
+      png_free_default(png_ptr, ptr);

 }
 
 void PNGAPI
 }
 
 void PNGAPI


@@ -274,6 +308,9 @@ png_free_default(png_structp png_ptr, png_voidp ptr)
 {
 #endif /* PNG_USER_MEM_SUPPORTED */
 
 {
 #endif /* PNG_USER_MEM_SUPPORTED */
 

+   if (png_ptr == NULL || ptr == NULL)
+      return;
+

    if (png_ptr->offset_table != NULL)
    {
       int i;
    if (png_ptr->offset_table != NULL)
    {
       int i;


@@ -311,7 +348,7 @@ png_voidp /* PRIVATE */
 png_create_struct(int type)
 {
 #ifdef PNG_USER_MEM_SUPPORTED
 png_create_struct(int type)
 {
 #ifdef PNG_USER_MEM_SUPPORTED

-   return (png_create_struct_2(type, png_malloc_ptr_NULL, png_voidp_NULL));
+   return (png_create_struct_2(type, NULL, NULL));

 }
 
 /* Allocate memory for a png_struct or a png_info.  The malloc and
 }
 
 /* Allocate memory for a png_struct or a png_info.  The malloc and


@@ -325,14 +362,14 @@ png_create_struct_2(int type, png_malloc_ptr malloc_fn, png_voidp mem_ptr)
    png_voidp struct_ptr;
 
    if (type == PNG_STRUCT_INFO)
    png_voidp struct_ptr;
 
    if (type == PNG_STRUCT_INFO)

-      size = sizeof(png_info);
+      size = png_sizeof(png_info);

    else if (type == PNG_STRUCT_PNG)
    else if (type == PNG_STRUCT_PNG)

-      size = sizeof(png_struct);
+      size = png_sizeof(png_struct);

    else
       return (NULL);
 
 #ifdef PNG_USER_MEM_SUPPORTED
    else
       return (NULL);
 
 #ifdef PNG_USER_MEM_SUPPORTED

-   if(malloc_fn != NULL)
+   if (malloc_fn != NULL)

    {
       png_struct dummy_struct;
       png_structp png_ptr = &dummy_struct;
    {
       png_struct dummy_struct;
       png_structp png_ptr = &dummy_struct;


@@ -345,17 +382,16 @@ png_create_struct_2(int type, png_malloc_ptr malloc_fn, png_voidp mem_ptr)
 #endif /* PNG_USER_MEM_SUPPORTED */
 
 #if defined(__TURBOC__) && !defined(__FLAT__)
 #endif /* PNG_USER_MEM_SUPPORTED */
 
 #if defined(__TURBOC__) && !defined(__FLAT__)

-   if ((struct_ptr = (png_voidp)farmalloc(size)) != NULL)
+   struct_ptr = (png_voidp)farmalloc(size);

 #else
 # if defined(_MSC_VER) && defined(MAXSEG_64K)
 #else
 # if defined(_MSC_VER) && defined(MAXSEG_64K)

-   if ((struct_ptr = (png_voidp)halloc(size,1)) != NULL)
+   struct_ptr = (png_voidp)halloc(size, 1);

 # else
 # else

-   if ((struct_ptr = (png_voidp)malloc(size)) != NULL)
+   struct_ptr = (png_voidp)malloc(size);

 # endif
 #endif
 # endif
 #endif

-   {
+   if (struct_ptr != NULL)

       png_memset(struct_ptr, 0, size);
       png_memset(struct_ptr, 0, size);

-   }

 
    return (struct_ptr);
 }
 
    return (struct_ptr);
 }


@@ -366,7 +402,7 @@ void /* PRIVATE */
 png_destroy_struct(png_voidp struct_ptr)
 {
 #ifdef PNG_USER_MEM_SUPPORTED
 png_destroy_struct(png_voidp struct_ptr)
 {
 #ifdef PNG_USER_MEM_SUPPORTED

-   png_destroy_struct_2(struct_ptr, png_free_ptr_NULL, png_voidp_NULL);
+   png_destroy_struct_2(struct_ptr, NULL, NULL);

 }
 
 /* Free memory allocated by a png_create_struct() call */
 }
 
 /* Free memory allocated by a png_create_struct() call */


@@ -378,7 +414,7 @@ png_destroy_struct_2(png_voidp struct_ptr, png_free_ptr free_fn,
    if (struct_ptr != NULL)
    {
 #ifdef PNG_USER_MEM_SUPPORTED
    if (struct_ptr != NULL)
    {
 #ifdef PNG_USER_MEM_SUPPORTED

-      if(free_fn != NULL)
+      if (free_fn != NULL)

       {
          png_struct dummy_struct;
          png_structp png_ptr = &dummy_struct;
       {
          png_struct dummy_struct;
          png_structp png_ptr = &dummy_struct;


@@ -400,65 +436,93 @@ png_destroy_struct_2(png_voidp struct_ptr, png_free_ptr free_fn,
 }
 
 /* Allocate memory.  For reasonable files, size should never exceed
 }
 
 /* Allocate memory.  For reasonable files, size should never exceed

-   64K.  However, zlib may allocate more then 64K if you don't tell
-   it not to.  See zconf.h and png.h for more information.  zlib does
-   need to allocate exactly 64K, so whatever you call here must
-   have the ability to do that. */
+ * 64K.  However, zlib may allocate more then 64K if you don't tell
+ * it not to.  See zconf.h and png.h for more information.  zlib does
+ * need to allocate exactly 64K, so whatever you call here must
+ * have the ability to do that.
+ */

 
 png_voidp PNGAPI
 
 png_voidp PNGAPI

-png_malloc(png_structp png_ptr, png_uint_32 size)
+png_calloc(png_structp png_ptr, png_alloc_size_t size)

 {
    png_voidp ret;
 
 {
    png_voidp ret;
 

+   ret = (png_malloc(png_ptr, size));
+   if (ret != NULL)
+      png_memset(ret,0,(png_size_t)size);
+   return (ret);
+}
+
+png_voidp PNGAPI
+png_malloc(png_structp png_ptr, png_alloc_size_t size)
+{
+   png_voidp ret;
+
+#ifdef PNG_USER_MEM_SUPPORTED

    if (png_ptr == NULL || size == 0)
       return (NULL);
 
    if (png_ptr == NULL || size == 0)
       return (NULL);
 

-#ifdef PNG_USER_MEM_SUPPORTED
-   if(png_ptr->malloc_fn != NULL)
-   {
-       ret = ((png_voidp)(*(png_ptr->malloc_fn))(png_ptr, (png_size_t)size));
-       if (ret == NULL && (png_ptr->flags&PNG_FLAG_MALLOC_NULL_MEM_OK) == 0)
-          png_error(png_ptr, "Out of Memory!");
-       return (ret);
-   }
+   if (png_ptr->malloc_fn != NULL)
+      ret = ((png_voidp)(*(png_ptr->malloc_fn))(png_ptr, (png_size_t)size));

    else
    else

-       return (png_malloc_default(png_ptr, size));
+      ret = (png_malloc_default(png_ptr, size));
+   if (ret == NULL && (png_ptr->flags&PNG_FLAG_MALLOC_NULL_MEM_OK) == 0)
+       png_error(png_ptr, "Out of Memory");
+   return (ret);

 }
 
 png_voidp PNGAPI
 }
 
 png_voidp PNGAPI

-png_malloc_default(png_structp png_ptr, png_uint_32 size)
+png_malloc_default(png_structp png_ptr, png_alloc_size_t size)

 {
    png_voidp ret;
 #endif /* PNG_USER_MEM_SUPPORTED */
 
 {
    png_voidp ret;
 #endif /* PNG_USER_MEM_SUPPORTED */
 

+   if (png_ptr == NULL || size == 0)
+      return (NULL);
+

 #ifdef PNG_MAX_MALLOC_64K
    if (size > (png_uint_32)65536L)
    {
 #ifdef PNG_MAX_MALLOC_64K
    if (size > (png_uint_32)65536L)
    {

-      if(png_ptr->flags&PNG_FLAG_MALLOC_NULL_MEM_OK) == 0)
+#ifndef PNG_USER_MEM_SUPPORTED
+      if ((png_ptr->flags&PNG_FLAG_MALLOC_NULL_MEM_OK) == 0)

          png_error(png_ptr, "Cannot Allocate > 64K");
       else
          png_error(png_ptr, "Cannot Allocate > 64K");
       else

+#endif

          return NULL;
    }
 #endif
 
          return NULL;
    }
 #endif
 

+   /* Check for overflow */

 #if defined(__TURBOC__) && !defined(__FLAT__)
 #if defined(__TURBOC__) && !defined(__FLAT__)

-   ret = farmalloc(size);
+   if (size != (unsigned long)size)
+      ret = NULL;
+   else
+      ret = farmalloc(size);

 #else
 # if defined(_MSC_VER) && defined(MAXSEG_64K)
 #else
 # if defined(_MSC_VER) && defined(MAXSEG_64K)

-   ret = halloc(size, 1);
+   if (size != (unsigned long)size)
+      ret = NULL;
+   else
+      ret = halloc(size, 1);

 # else
 # else

-   ret = malloc((size_t)size);
+   if (size != (size_t)size)
+      ret = NULL;
+   else
+      ret = malloc((size_t)size);

 # endif
 #endif
 
 # endif
 #endif
 

+#ifndef PNG_USER_MEM_SUPPORTED

    if (ret == NULL && (png_ptr->flags&PNG_FLAG_MALLOC_NULL_MEM_OK) == 0)
       png_error(png_ptr, "Out of Memory");
    if (ret == NULL && (png_ptr->flags&PNG_FLAG_MALLOC_NULL_MEM_OK) == 0)
       png_error(png_ptr, "Out of Memory");

+#endif

 
    return (ret);
 }
 
 /* Free a pointer allocated by png_malloc().  If ptr is NULL, return
 
    return (ret);
 }
 
 /* Free a pointer allocated by png_malloc().  If ptr is NULL, return

-   without taking any action. */
+ * without taking any action.
+ */

 void PNGAPI
 png_free(png_structp png_ptr, png_voidp ptr)
 {
 void PNGAPI
 png_free(png_structp png_ptr, png_voidp ptr)
 {


@@ -471,7 +535,8 @@ png_free(png_structp png_ptr, png_voidp ptr)
       (*(png_ptr->free_fn))(png_ptr, ptr);
       return;
    }
       (*(png_ptr->free_fn))(png_ptr, ptr);
       return;
    }

-   else png_free_default(png_ptr, ptr);
+   else
+      png_free_default(png_ptr, ptr);

 }
 void PNGAPI
 png_free_default(png_structp png_ptr, png_voidp ptr)
 }
 void PNGAPI
 png_free_default(png_structp png_ptr, png_voidp ptr)


@@ -494,52 +559,26 @@ png_free_default(png_structp png_ptr, png_voidp ptr)
 
 #endif /* Not Borland DOS special memory handler */
 
 
 #endif /* Not Borland DOS special memory handler */
 

-#if defined(PNG_1_0_X)
-#  define png_malloc_warn png_malloc
-#else

 /* This function was added at libpng version 1.2.3.  The png_malloc_warn()
 /* This function was added at libpng version 1.2.3.  The png_malloc_warn()

- * function will issue a png_warning and return NULL instead of issuing a
- * png_error, if it fails to allocate the requested memory.
+ * function will set up png_malloc() to issue a png_warning and return NULL
+ * instead of issuing a png_error, if it fails to allocate the requested
+ * memory.

  */
 png_voidp PNGAPI
  */
 png_voidp PNGAPI

-png_malloc_warn(png_structp png_ptr, png_uint_32 size)
+png_malloc_warn(png_structp png_ptr, png_alloc_size_t size)

 {
    png_voidp ptr;
 {
    png_voidp ptr;

-   png_uint_32 save_flags=png_ptr->flags;
+   png_uint_32 save_flags;
+   if (png_ptr == NULL)
+      return (NULL);

 
 

+   save_flags = png_ptr->flags;

    png_ptr->flags|=PNG_FLAG_MALLOC_NULL_MEM_OK;
    ptr = (png_voidp)png_malloc((png_structp)png_ptr, size);
    png_ptr->flags=save_flags;
    return(ptr);
 }
    png_ptr->flags|=PNG_FLAG_MALLOC_NULL_MEM_OK;
    ptr = (png_voidp)png_malloc((png_structp)png_ptr, size);
    png_ptr->flags=save_flags;
    return(ptr);
 }

-#endif
-
-png_voidp PNGAPI
-png_memcpy_check (png_structp png_ptr, png_voidp s1, png_voidp s2,
-   png_uint_32 length)
-{
-   png_size_t size;
-
-   size = (png_size_t)length;
-   if ((png_uint_32)size != length)
-      png_error(png_ptr,"Overflow in png_memcpy_check.");

 
 

-   return(png_memcpy (s1, s2, size));
-}
-
-png_voidp PNGAPI
-png_memset_check (png_structp png_ptr, png_voidp s1, int value,
-   png_uint_32 length)
-{
-   png_size_t size;
-
-   size = (png_size_t)length;
-   if ((png_uint_32)size != length)
-      png_error(png_ptr,"Overflow in png_memset_check.");
-
-   return (png_memset (s1, value, size));
-
-}

 
 #ifdef PNG_USER_MEM_SUPPORTED
 /* This function is called when the application wants to use another method
 
 #ifdef PNG_USER_MEM_SUPPORTED
 /* This function is called when the application wants to use another method


@@ -549,9 +588,12 @@ void PNGAPI
 png_set_mem_fn(png_structp png_ptr, png_voidp mem_ptr, png_malloc_ptr
   malloc_fn, png_free_ptr free_fn)
 {
 png_set_mem_fn(png_structp png_ptr, png_voidp mem_ptr, png_malloc_ptr
   malloc_fn, png_free_ptr free_fn)
 {

-   png_ptr->mem_ptr = mem_ptr;
-   png_ptr->malloc_fn = malloc_fn;
-   png_ptr->free_fn = free_fn;
+   if (png_ptr != NULL)
+   {
+      png_ptr->mem_ptr = mem_ptr;
+      png_ptr->malloc_fn = malloc_fn;
+      png_ptr->free_fn = free_fn;
+   }

 }
 
 /* This function returns a pointer to the mem_ptr associated with the user
 }
 
 /* This function returns a pointer to the mem_ptr associated with the user


@@ -561,6 +603,9 @@ png_set_mem_fn(png_structp png_ptr, png_voidp mem_ptr, png_malloc_ptr
 png_voidp PNGAPI
 png_get_mem_ptr(png_structp png_ptr)
 {
 png_voidp PNGAPI
 png_get_mem_ptr(png_structp png_ptr)
 {

+   if (png_ptr == NULL)
+      return (NULL);

    return ((png_voidp)png_ptr->mem_ptr);
 }
 #endif /* PNG_USER_MEM_SUPPORTED */
    return ((png_voidp)png_ptr->mem_ptr);
 }
 #endif /* PNG_USER_MEM_SUPPORTED */

+#endif /* PNG_READ_SUPPORTED || PNG_WRITE_SUPPORTED */