libobs-opengl: Miscellaneous static analysis fixes

Detected by PVS Studio.
master
Richard Stanway 2022-01-15 22:56:23 +00:00
parent 9728345bf4
commit a3c97dfad2
3 changed files with 10 additions and 12 deletions

View File

@ -228,12 +228,15 @@ static bool gl_shader_init(struct gs_shader *shader,
char *infoLog = malloc(sizeof(char) * infoLength);
GLsizei returnedLength = 0;
glGetShaderInfoLog(shader->obj, infoLength, &returnedLength,
infoLog);
blog(LOG_ERROR, "Error compiling shader:\n%s\n", infoLog);
if (infoLog) {
GLsizei returnedLength = 0;
glGetShaderInfoLog(shader->obj, infoLength,
&returnedLength, infoLog);
blog(LOG_ERROR, "Error compiling shader:\n%s\n",
infoLog);
free(infoLog);
free(infoLog);
}
success = false;
}

View File

@ -159,7 +159,6 @@ static xcb_get_geometry_reply_t *get_window_geometry(xcb_connection_t *xcb_conn,
return 0;
}
free(error);
return reply;
}
@ -371,8 +370,7 @@ static Display *open_windowless_display(Display *platform_display)
return display;
error:
if (display)
XCloseDisplay(display);
XCloseDisplay(display);
return NULL;
}

View File

@ -163,7 +163,6 @@ static xcb_get_geometry_reply_t *get_window_geometry(xcb_connection_t *xcb_conn,
return 0;
}
free(error);
return reply;
}
@ -195,7 +194,6 @@ static bool gl_context_create(struct gl_platform *plat)
}
plat->context = context;
plat->display = display;
plat->pbuffer =
glXCreatePbuffer(display, config[0], ctx_pbuffer_attribs);
@ -273,8 +271,7 @@ static Display *open_windowless_display(void)
return display;
error:
if (display)
XCloseDisplay(display);
XCloseDisplay(display);
return NULL;
}