diff options
| author | Gerald Carter <jerry@samba.org> | 2007-05-14 14:23:51 +0000 |
|---|---|---|
| committer | Gerald (Jerry) Carter <jerry@samba.org> | 2007-10-10 12:22:02 -0500 |
| commit | d34f6bb969092166c961e328229b1b05a30f6930 (patch) | |
| tree | 5cad4256a4dab7d6a7545188f877b7c78cf7c8f0 /source3/include | |
| parent | 00790cb8afaf768ba650ee40796ccdafc535ae8d (diff) | |
| download | samba-d34f6bb969092166c961e328229b1b05a30f6930.tar.gz samba-d34f6bb969092166c961e328229b1b05a30f6930.tar.bz2 samba-d34f6bb969092166c961e328229b1b05a30f6930.zip | |
r22852: merge fixes for CVE-2007-2446 and CVE-2007-2447 to all branches
(This used to be commit f65214be68c1a59d9598bfb9f3b19e71cc3fa07b)
Diffstat (limited to 'source3/include')
| -rw-r--r-- | source3/include/smb_macros.h | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/source3/include/smb_macros.h b/source3/include/smb_macros.h index afe7c1a477..bfed27c167 100644 --- a/source3/include/smb_macros.h +++ b/source3/include/smb_macros.h @@ -295,7 +295,6 @@ copy an IP address from one buffer to another #if defined(PARANOID_MALLOC_CHECKER) #define PRS_ALLOC_MEM(ps, type, count) (type *)prs_alloc_mem_((ps),sizeof(type),(count)) -#define PRS_ALLOC_MEM_VOID(ps, size) prs_alloc_mem_((ps),(size),1) /* Get medieval on our ass about malloc.... */ @@ -334,7 +333,6 @@ copy an IP address from one buffer to another #else #define PRS_ALLOC_MEM(ps, type, count) (type *)prs_alloc_mem((ps),sizeof(type),(count)) -#define PRS_ALLOC_MEM_VOID(ps, size) prs_alloc_mem((ps),(size),1) /* Regular malloc code. */ |