[BACK]Return to xmalloc.c CVS log [TXT][DIR] Up to [local] / src / usr.bin / ssh

Diff for /src/usr.bin/ssh/xmalloc.c between version 1.31 and 1.32

version 1.31, 2015/02/06 23:21:59 version 1.32, 2015/04/24 01:36:01
Line 52 
Line 52 
 }  }
   
 void *  void *
 xrealloc(void *ptr, size_t nmemb, size_t size)  xreallocarray(void *ptr, size_t nmemb, size_t size)
 {  {
         void *new_ptr;          void *new_ptr;
         size_t new_size = nmemb * size;  
   
         if (new_size == 0)          new_ptr = reallocarray(ptr, nmemb, size);
                 fatal("xrealloc: zero size");  
         if (SIZE_MAX / nmemb < size)  
                 fatal("xrealloc: nmemb * size > SIZE_MAX");  
         if (ptr == NULL)  
                 new_ptr = malloc(new_size);  
         else  
                 new_ptr = realloc(ptr, new_size);  
         if (new_ptr == NULL)          if (new_ptr == NULL)
                 fatal("xrealloc: out of memory (new_size %zu bytes)",                  fatal("xreallocarray: out of memory (%zu elements of %zu bytes)",
                     new_size);                      nmemb, size);
         return new_ptr;          return new_ptr;
 }  }
   

Legend:
Removed from v.1.31  
changed lines
  Added in v.1.32