virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2025-10-30 23:18:11 +02:00
Code Issues Releases Activity

Do not misuse unsigned long to store pointers.

Browse Source 
Originally committed as revision 16986 to svn://svn.ffmpeg.org/ffmpeg/trunk
This commit is contained in:
Ramiro Polla
2009-02-04 05:56:39 +00:00
parent 5a897cfa3c
commit 2db5da97e2
2 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
libavformat/avformat.h
View File

@@ -1197,7 +1197,7 @@ int avf_sdp_create(AVFormatContext *ac[], int n_files, char *buff, int size);
#ifdef HAVE_AV_CONFIG_H
void ff_dynarray_add(unsigned long **tab_ptr, int *nb_ptr, unsigned long elem);
void ff_dynarray_add(intptr_t **tab_ptr, int *nb_ptr, intptr_t elem);
#ifdef __GNUC__
#define dynarray_add(tab, nb_ptr, elem)\
@@ -1205,12 +1205,12 @@ do {\
__typeof__(tab) _tab = (tab);\
__typeof__(elem) _elem = (elem);\
(void)sizeof(**_tab == _elem); /* check that types are compatible */\
ff_dynarray_add((unsigned long **)_tab, nb_ptr, (unsigned long)_elem);\
ff_dynarray_add((intptr_t **)_tab, nb_ptr, (intptr_t)_elem);\
} while(0)
#else
#define dynarray_add(tab, nb_ptr, elem)\
do {\
ff_dynarray_add((unsigned long **)(tab), nb_ptr, (unsigned long)(elem));\
ff_dynarray_add((intptr_t **)(tab), nb_ptr, (intptr_t)(elem));\
} while(0)
#endif

6
libavformat/cutils.c
View File

@@ -21,10 +21,10 @@
#include "avformat.h"
/* add one element to a dynamic array */
void ff_dynarray_add(unsigned long **tab_ptr, int *nb_ptr, unsigned long elem)
void ff_dynarray_add(intptr_t **tab_ptr, int *nb_ptr, intptr_t elem)
{
int nb, nb_alloc;
unsigned long *tab;
intptr_t *tab;
nb = *nb_ptr;
tab = *tab_ptr;
@@ -33,7 +33,7 @@ void ff_dynarray_add(unsigned long **tab_ptr, int *nb_ptr, unsigned long elem)
nb_alloc = 1;
else
nb_alloc = nb * 2;
tab = av_realloc(tab, nb_alloc * sizeof(unsigned long));
tab = av_realloc(tab, nb_alloc * sizeof(intptr_t));
*tab_ptr = tab;
}
tab[nb++] = elem;