summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--Gui/skin/skin.c6
-rw-r--r--help/help_mp-en.h1
2 files changed, 6 insertions, 1 deletions
diff --git a/Gui/skin/skin.c b/Gui/skin/skin.c
index 3b619ed1a3..cf25a2827f 100644
--- a/Gui/skin/skin.c
+++ b/Gui/skin/skin.c
@@ -688,7 +688,11 @@ int skinRead( char * dname )
linenumber=0;
while ( !feof( skinFile ) )
{
- fgets( tmp,255,skinFile ); linenumber++;
+ if (!fgets( tmp,255,skinFile )) {
+ mp_msg(MSGT_GPLAYER, MSGL_FATAL, MSGTR_SKIN_SkinFileNotReadable, fn);
+ return -1;
+ }
+ linenumber++;
c=tmp[ strlen( tmp ) - 1 ]; if ( c == '\n' || c == '\r' ) tmp[ strlen( tmp ) - 1 ]=0;
c=tmp[ strlen( tmp ) - 1 ]; if ( c == '\n' || c == '\r' ) tmp[ strlen( tmp ) - 1 ]=0;
diff --git a/help/help_mp-en.h b/help/help_mp-en.h
index 8b15f4f81f..67f064c96b 100644
--- a/help/help_mp-en.h
+++ b/help/help_mp-en.h
@@ -641,6 +641,7 @@ static char help_text[]=
#define MSGTR_SKIN_WARNING2 "[skin] warning in config file line %d:\nwidget (%s) found but no \"subsection\" found before"
#define MSGTR_SKIN_WARNING3 "[skin] warning in config file line %d:\nthis subsection is not supported by widget (%s)"
#define MSGTR_SKIN_SkinFileNotFound "[skin] file ( %s ) not found.\n"
+#define MSGTR_SKIN_SkinFileNotReadable "[skin] file ( %s ) not readable.\n"
#define MSGTR_SKIN_BITMAP_16bit "16 bits or less depth bitmap not supported (%s).\n"
#define MSGTR_SKIN_BITMAP_FileNotFound "file not found (%s)\n"
#define MSGTR_SKIN_BITMAP_BMPReadError "BMP read error (%s)\n"