Commit de185357 authored by Birte Kristina Friesel's avatar Birte Kristina Friesel
Browse files

Fix segfault when editing an image without info struct

parent 1c36c74c

src/imlib.c

+12 −4
Original line number Diff line number Diff line
@@ -1213,8 +1213,12 @@ void feh_edit_inplace(winwidget w, int op) 
		else {

			imlib_image_orientate(op);

			tmp = w->im_w;

			FEH_FILE(w->file->data)->info->width = w->im_w = w->im_h;

			FEH_FILE(w->file->data)->info->height = w->im_h = tmp;

			w->im_w = w->im_h;

			w->im_h = tmp;

			if (FEH_FILE(w->file->data)->info) {

				FEH_FILE(w->file->data)->info->width = w->im_w;

				FEH_FILE(w->file->data)->info->height = w->im_h;

			}

		}

		winwidget_render_image(w, 1, 0);

		return;
@@ -1257,8 +1261,12 @@ void feh_edit_inplace(winwidget w, int op) 
		else {

			imlib_image_orientate(op);

			tmp = w->im_w;

			FEH_FILE(w->file->data)->info->width = w->im_w = w->im_h;

			FEH_FILE(w->file->data)->info->height = w->im_h = tmp;

			w->im_w = w->im_h;

			w->im_h = tmp;

			if (FEH_FILE(w->file->data)->info) {

				FEH_FILE(w->file->data)->info->width = w->im_w;

				FEH_FILE(w->file->data)->info->height = w->im_h;

			}

		}

		im_weprintf(w, "unable to edit in place. Changes have not been saved.");

		winwidget_render_image(w, 1, 0);