jp9000/obs-studio
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #69 from lioncash/misc

Browse Source 
[OGL] Fix a possible null pointer dereference
This commit is contained in:
Jim 2014-04-21 20:13:42 -07:00
commit 6064afbe9f
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
libobs-opengl/gl-windows.c
View File

@ -310,11 +310,11 @@ static int gl_choose_pixel_format(HDC hdc, struct gs_init_data *info)
static inline bool gl_getpixelformat(HDC hdc, struct gs_init_data *info, static inline bool gl_getpixelformat(HDC hdc, struct gs_init_data *info,
int *format, PIXELFORMATDESCRIPTOR *pfd) int *format, PIXELFORMATDESCRIPTOR *pfd)
{ {
*format = gl_choose_pixel_format(hdc, info);
if (!format) if (!format)
return false; return false;
*format = gl_choose_pixel_format(hdc, info);
if (!DescribePixelFormat(hdc, *format, sizeof(*pfd), pfd)) { if (!DescribePixelFormat(hdc, *format, sizeof(*pfd), pfd)) {
blog(LOG_ERROR, "DescribePixelFormat failed, %u", blog(LOG_ERROR, "DescribePixelFormat failed, %u",
GetLastError()); GetLastError());