diff options
| author | marha <marha@users.sourceforge.net> | 2014-01-15 21:37:10 +0100 |
|---|---|---|
| committer | marha <marha@users.sourceforge.net> | 2014-01-15 21:37:10 +0100 |
| commit | b7f01cb1f6cfd1ec301f650a073436c91ec614aa (patch) | |
| tree | 1dbf32344313ad7e5884e6686251cad398a231fa /mesalib/src/mapi/glapi/gen/glX_proto_send.py | |
| parent | 7b4b94b4449aec056c4c92f5cacc2f89a292a80e (diff) | |
| parent | 1b0fcca503ae9cf2d462b60770f96c794dfbb27a (diff) | |
| download | vcxsrv-b7f01cb1f6cfd1ec301f650a073436c91ec614aa.tar.gz vcxsrv-b7f01cb1f6cfd1ec301f650a073436c91ec614aa.tar.bz2 vcxsrv-b7f01cb1f6cfd1ec301f650a073436c91ec614aa.zip | |
Merge remote-tracking branch 'origin/released'
* origin/released:
mesa xkeyboard-config xserver git update 15 jan 2014
randrproto libfontenc mesa xserver git update 10 Jan 2014
randsrproto fontconfig libX11 git update 6 Jan 2014
Conflicts:
mesalib/src/glsl/builtin_functions.cpp
mesalib/src/glsl/ir_builder.h
xorg-server/Xext/xres.c
xorg-server/dix/dispatch.c
xorg-server/dix/dixfonts.c
xorg-server/hw/xwin/wingc.c
xorg-server/hw/xwin/winwindowswm.c
xorg-server/include/gc.h
xorg-server/os/access.c
Diffstat (limited to 'mesalib/src/mapi/glapi/gen/glX_proto_send.py')
| -rwxr-xr-x | mesalib/src/mapi/glapi/gen/glX_proto_send.py | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/mesalib/src/mapi/glapi/gen/glX_proto_send.py b/mesalib/src/mapi/glapi/gen/glX_proto_send.py index f4d519f14..8b804418b 100755 --- a/mesalib/src/mapi/glapi/gen/glX_proto_send.py +++ b/mesalib/src/mapi/glapi/gen/glX_proto_send.py @@ -971,6 +971,8 @@ struct _glapi_table * __glXNewIndirectAPI( void ) entries = _glapi_get_dispatch_table_size(); table = malloc(entries * sizeof(_glapi_proc)); + if (table == NULL) + return NULL; /* first, set all entries to point to no-op functions */ for (i = 0; i < entries; i++) { |