Browse Source

fix NPE when no background image

master
Pandora 7 years ago
parent
commit
5a8c96ea4c
No known key found for this signature in database GPG Key ID: 55DB77C2A03E1EF5
  1. 2
      i3lock.c
  2. 1
      jpg.c

2
i3lock.c

@ -1842,7 +1842,7 @@ int main(int argc, char *argv[]) {
} }
} }
/* In case loading failed, we just pretend no -i was specified. */ /* In case loading failed, we just pretend no -i was specified. */
if (cairo_surface_status(img) != CAIRO_STATUS_SUCCESS) { if (img && cairo_surface_status(img) != CAIRO_STATUS_SUCCESS) {
fprintf(stderr, "Could not load image \"%s\": %s\n", fprintf(stderr, "Could not load image \"%s\": %s\n",
image_path, cairo_status_to_string(cairo_surface_status(img))); image_path, cairo_status_to_string(cairo_surface_status(img)));
img = NULL; img = NULL;

1
jpg.c

@ -14,6 +14,7 @@
* Checks if the file is a JPEG by looking for a valid JPEG header. * Checks if the file is a JPEG by looking for a valid JPEG header.
*/ */
bool file_is_jpg(char* file_path) { bool file_is_jpg(char* file_path) {
if (!file_path) return false;
FILE* image_file; FILE* image_file;
uint16_t file_header; uint16_t file_header;
size_t read_count; size_t read_count;

Loading…
Cancel
Save