viewer: fix crash when viewing files with PK/ZIP magic bytes

configure.ac

@@ -697,6 +697,7 @@ tests/lib/vfs/mc.charsets
 tests/lib/widget/Makefile
 tests/src/Makefile
 tests/src/filemanager/Makefile
+tests/src/viewer/Makefile
 tests/src/editor/Makefile
 tests/src/editor/edit_complete_word_cmd_test_data.txt
 tests/src/vfs/Makefile

lib/util.c

@@ -977,7 +977,7 @@ list_append_unique (GList *list, char *text)
  * If there is no stored data, return line 1 and col 0.
  */
 
-void
+MC_MOCKABLE void
 load_file_position (const vfs_path_t *filename_vpath, long *line, long *column, off_t *offset,
                     GArray **bookmarks)
 {

lib/widget/wtools.c

@@ -376,7 +376,7 @@ create_message (int flags, const char *title, const char *text, ...)
 /* --------------------------------------------------------------------------------------------- */
 /** Show message box, background safe */
 
-void
+MC_MOCKABLE void
 message (int flags, const char *title, const char *text, ...)
 {
     char *p;

src/util.c

@@ -81,7 +81,7 @@ check_for_default (const vfs_path_t *default_file_vpath, const vfs_path_t *file_
  * @param file file name. Can be NULL.
  */
 
-void
+MC_MOCKABLE void
 file_error_message (const char *format, const char *filename)
 {
     const char *error_string = unix_error_string (errno);

src/viewer/display.c

@@ -234,7 +234,7 @@ mcview_update (WView *view)
 /* --------------------------------------------------------------------------------------------- */
 /** Displays as much data from view->dpy_start as fits on the screen */
 
-void
+MC_MOCKABLE void
 mcview_display (WView *view)
 {
     if (view->mode_flags.hex)
@@ -246,7 +246,7 @@ mcview_display (WView *view)
 
 /* --------------------------------------------------------------------------------------------- */
 
-void
+MC_MOCKABLE void
 mcview_compute_areas (WView *view)
 {
     WRect view_area;
@@ -302,7 +302,7 @@ mcview_compute_areas (WView *view)
 
 /* --------------------------------------------------------------------------------------------- */
 
-void
+MC_MOCKABLE void
 mcview_update_bytes_per_line (WView *view)
 {
     int cols = view->data_area.cols;

src/viewer/lib.c

@@ -256,7 +256,7 @@ mcview_done (WView *view)
 
 /* --------------------------------------------------------------------------------------------- */
 
-void
+MC_MOCKABLE void
 mcview_set_codeset (WView *view)
 {
     const char *cp_id = NULL;
@@ -290,7 +290,7 @@ mcview_select_encoding (WView *view)
 
 /* --------------------------------------------------------------------------------------------- */
 
-void
+MC_MOCKABLE void
 mcview_show_error (WView *view, const char *format, const char *filename)
 {
     if (mcview_is_in_panel (view))

src/viewer/mcviewer.c

@@ -398,8 +398,7 @@ mcview_load (WView *view, const char *command, const char *file, int start_line,
 
                     if (fd1 == -1)
                     {
-                        mcview_close_datasource (view);
-                        mcview_show_error (view, _ ("Cannot open\n%s\nin parse mode\n%s"), file);
+                        // VFS decompression failed -- display raw file content
                     }
                     else
                     {

tests/src/Makefile.am

@@ -1,6 +1,6 @@
 PACKAGE_STRING = "/src"
 
-SUBDIRS = . filemanager vfs
+SUBDIRS = . filemanager vfs viewer
 
 if USE_INTERNAL_EDIT
 SUBDIRS += editor

tests/src/viewer/Makefile.am

@@ -0,0 +1,24 @@
+PACKAGE_STRING = "/src/viewer"
+
+AM_CPPFLAGS = \
+	$(GLIB_CFLAGS) \
+	-I$(top_srcdir) \
+	-I$(top_srcdir)/lib/vfs \
+	-DTEST_SHARE_DIR=\"$(abs_srcdir)/../fixtures\" \
+	@CHECK_CFLAGS@
+
+LIBS = @CHECK_LIBS@ \
+	$(top_builddir)/src/libinternal.la \
+	$(top_builddir)/lib/libmc.la
+
+if ENABLE_MCLIB
+LIBS += $(GLIB_LIBS)
+endif
+
+TESTS = \
+	mcview__load_zip_magic
+
+check_PROGRAMS = $(TESTS)
+
+mcview__load_zip_magic_SOURCES = \
+	mcview__load_zip_magic.c