Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(93)

Side by Side Diff: src/libFLAC/memory.c

Issue 2866623002: Include limits.h on Android to work around NDK deficiency (Closed)
Patch Set: Created 3 years, 7 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
« no previous file with comments | « src/libFLAC/md5.c ('k') | no next file » | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 /* libFLAC - Free Lossless Audio Codec library 1 /* libFLAC - Free Lossless Audio Codec library
2 * Copyright (C) 2001-2009 Josh Coalson 2 * Copyright (C) 2001-2009 Josh Coalson
3 * Copyright (C) 2011-2014 Xiph.Org Foundation 3 * Copyright (C) 2011-2014 Xiph.Org Foundation
4 * 4 *
5 * Redistribution and use in source and binary forms, with or without 5 * Redistribution and use in source and binary forms, with or without
6 * modification, are permitted provided that the following conditions 6 * modification, are permitted provided that the following conditions
7 * are met: 7 * are met:
8 * 8 *
9 * - Redistributions of source code must retain the above copyright 9 * - Redistributions of source code must retain the above copyright
10 * notice, this list of conditions and the following disclaimer. 10 * notice, this list of conditions and the following disclaimer.
(...skipping 22 matching lines...) Expand all
33 #ifdef HAVE_CONFIG_H 33 #ifdef HAVE_CONFIG_H
34 # include <config.h> 34 # include <config.h>
35 #endif 35 #endif
36 36
37 #ifdef HAVE_STDINT_H 37 #ifdef HAVE_STDINT_H
38 #include <stdint.h> 38 #include <stdint.h>
39 #endif 39 #endif
40 40
41 #include "private/memory.h" 41 #include "private/memory.h"
42 #include "FLAC/assert.h" 42 #include "FLAC/assert.h"
43 #include "share/compat.h"
43 #include "share/alloc.h" 44 #include "share/alloc.h"
44 45
45 void *FLAC__memory_alloc_aligned(size_t bytes, void **aligned_address) 46 void *FLAC__memory_alloc_aligned(size_t bytes, void **aligned_address)
46 { 47 {
47 void *x; 48 void *x;
48 49
49 FLAC__ASSERT(0 != aligned_address); 50 FLAC__ASSERT(0 != aligned_address);
50 51
51 #ifdef FLAC__ALIGN_MALLOC_DATA 52 #ifdef FLAC__ALIGN_MALLOC_DATA
52 /* align on 32-byte (256-bit) boundary */ 53 /* align on 32-byte (256-bit) boundary */
(...skipping 156 matching lines...) Expand 10 before | Expand all | Expand 10 after
209 #endif 210 #endif
210 211
211 void *safe_malloc_mul_2op_p(size_t size1, size_t size2) 212 void *safe_malloc_mul_2op_p(size_t size1, size_t size2)
212 { 213 {
213 if(!size1 || !size2) 214 if(!size1 || !size2)
214 return malloc(1); /* malloc(0) is undefined; FLAC src convention is to always allocate */ 215 return malloc(1); /* malloc(0) is undefined; FLAC src convention is to always allocate */
215 if(size1 > SIZE_MAX / size2) 216 if(size1 > SIZE_MAX / size2)
216 return 0; 217 return 0;
217 return malloc(size1*size2); 218 return malloc(size1*size2);
218 } 219 }
OLDNEW
« no previous file with comments | « src/libFLAC/md5.c ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698