Merging upstream version 1.13~rc1.

Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>

1 files changed, 2 insertions, 2 deletions

diff --git a/rc.cc b/rc.cc
index 5a5c5b4..b671200 100644
--- a/rc.cc
+++ b/rc.cc
@@ -46,7 +46,7 @@ std::string compressor_names[num_formats] =
 std::vector< std::string > compressor_args[num_formats];
 
 // vector of enabled formats plus [num_formats] for uncompressed.
-// empty means all enabled.
+// empty or incomplete (size <= num_formats) means all enabled.
 std::vector< bool > enabled_formats;
 
 const struct { const char * from; const char * to; int format_index; }
@@ -292,7 +292,7 @@ int extension_format( const int eindex )
   { return ( eindex >= 0 ) ? known_extensions[eindex].format_index : -1; }
 
 const char * extension_from( const int eindex )
-  { return known_extensions[eindex].from; }
+  { return ( eindex >= 0 ) ? known_extensions[eindex].from : ""; }
 
 const char * extension_to( const int eindex )
   { return known_extensions[eindex].to; }