[MPlayer-cvslog] r35934 - trunk/libdvdcss/libdvdcss.c

[iive]

Author: iive
Date: Sat Mar  9 17:58:26 2013
New Revision: 35934

Log:
Avoid calling FreeLibrary() twice.

FreeLibrary() decreases a per-process reference/usage counter. This counter
is set to 1 when a library is loaded at startup and increased with each
LoadLibrary() call. Calling FreeLibrary() twice could unload the library
(that is loaded at startup) and break code that calls its functions directly.

In MPlayer this seems to happen with fontconfig package.

Modified:
   trunk/libdvdcss/libdvdcss.c

Modified: trunk/libdvdcss/libdvdcss.c
==============================================================================
--- trunk/libdvdcss/libdvdcss.c	Tue Mar  5 14:38:39 2013	(r35933)
+++ trunk/libdvdcss/libdvdcss.c	Sat Mar  9 17:58:26 2013	(r35934)
@@ -261,11 +261,7 @@ LIBDVDCSS_EXPORT dvdcss_t dvdcss_open ( 
             {
                 /* Get the "Application Data" folder for the current user */
                 if( p_getpath( NULL, CSIDL_APPDATA | CSIDL_FLAG_CREATE,
-                               NULL, SHGFP_TYPE_CURRENT, psz_home ) == S_OK )
-                {
-                    FreeLibrary( p_dll );
-                }
-                else
+                               NULL, SHGFP_TYPE_CURRENT, psz_home ) != S_OK )
                 {
                     *psz_home = '\0';
                 }