Skip to content

V
vlc
Commit 8dc8e064 authored by Jean-Baptiste Kempf's avatar Jean-Baptiste Kempf
Browse files
Options

DirectDraw: fix memleaks introduced by 46b26be5

parent 8de5a80d
Show whitespace changes
Inline Side-by-side
Showing with 9 additions and 5 deletions
modules/video_output/msw/directx.c
View file @ 8dc8e064
...@@ -454,8 +454,9 @@ static BOOL WINAPI DirectXOpenDDrawCallback(GUID *guid, LPTSTR desc, ...@@ -454,8 +454,9 @@ static BOOL WINAPI DirectXOpenDDrawCallback(GUID *guid, LPTSTR desc,
return TRUE; return TRUE;
char *psz_drivername = FromT(drivername); char *psz_drivername = FromT(drivername);
char *psz_desc = FromT(desc);
msg_Dbg(vd, "DirectXEnumCallback: %s, %s", FromT(desc), psz_drivername); msg_Dbg(vd, "DirectXEnumCallback: %s, %s", psz_desc, psz_drivername);
char *device = var_GetString(vd, "directx-device"); char *device = var_GetString(vd, "directx-device");
...@@ -484,7 +485,7 @@ static BOOL WINAPI DirectXOpenDDrawCallback(GUID *guid, LPTSTR desc, ...@@ -484,7 +485,7 @@ static BOOL WINAPI DirectXOpenDDrawCallback(GUID *guid, LPTSTR desc,
free(device); free(device);
if (hmon == sys->hmonitor) { if (hmon == sys->hmonitor) {
msg_Dbg(vd, "selecting %s, %s", FromT(desc), psz_drivername); msg_Dbg(vd, "selecting %s, %s", psz_desc, psz_drivername);
free(sys->display_driver); free(sys->display_driver);
sys->display_driver = malloc(sizeof(*guid)); sys->display_driver = malloc(sizeof(*guid));
...@@ -492,6 +493,8 @@ static BOOL WINAPI DirectXOpenDDrawCallback(GUID *guid, LPTSTR desc, ...@@ -492,6 +493,8 @@ static BOOL WINAPI DirectXOpenDDrawCallback(GUID *guid, LPTSTR desc,
*sys->display_driver = *guid; *sys->display_driver = *guid;
} }
free(psz_drivername);
free(psz_desc);
return TRUE; return TRUE;
} }
/** /**
...@@ -1430,14 +1433,15 @@ static BOOL WINAPI DirectXEnumCallback2(GUID *guid, LPTSTR desc, ...@@ -1430,14 +1433,15 @@ static BOOL WINAPI DirectXEnumCallback2(GUID *guid, LPTSTR desc,
VLC_UNUSED(guid); VLC_UNUSED(desc); VLC_UNUSED(hmon); VLC_UNUSED(guid); VLC_UNUSED(desc); VLC_UNUSED(hmon);
char *psz_drivername = FromT(drivername);
ctx->values = xrealloc(ctx->values, (ctx->count + 1) * sizeof(char *)); ctx->values = xrealloc(ctx->values, (ctx->count + 1) * sizeof(char *));
ctx->descs = xrealloc(ctx->descs, (ctx->count + 1) * sizeof(char *)); ctx->descs = xrealloc(ctx->descs, (ctx->count + 1) * sizeof(char *));
/* TODO? Unicode APIs */ ctx->values[ctx->count] = psz_drivername;
ctx->values[ctx->count] = FromT(drivername); ctx->descs[ctx->count] = psz_drivername;
ctx->descs[ctx->count] = FromT(drivername);
ctx->count++; ctx->count++;
free(psz_drivername);
return TRUE; /* Keep enumerating */ return TRUE; /* Keep enumerating */
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment