reject invalid background images

Changed files (2)

• modified src/Font.vala
• modified src/GlyphBackgroundImage.vala

Diff

diff --git a/src/Font.vala b/src/Font.valaindex 73ae3e2..1861107 100644--- a/src/Font.vala+++ b/src/Font.vala@@ -601,16 +601,23 @@ class Font : GLib.Object { 				 				try { 					bool selected;+					string data;+					 					foreach (Glyph g in gc.get_version_list ().glyphs) {-						+ 						if (g.get_background_image () != null) { 							bg = (!) g.get_background_image ();+							data = bg.get_png_base64 ();+							+							if (!bg.is_valid ()) {+								continue;+							} 							 							os.put_string (@"<background-image sha1=\""); 							os.put_string (bg.get_sha1 ()); 							os.put_string ("\" "); 							os.put_string (" data=\"");-							os.put_string (bg.get_png_base64 ());+							os.put_string (data); 							os.put_string (""); 							os.put_string ("\" />\n");	 						}@@ -683,7 +690,9 @@ class Font : GLib.Object { 			 			double rotation = background_image.img_rotation; 			-			os.put_string (@"\t<background sha1=\"$(background_image.get_sha1 ())\" x=\"$pos_x\" y=\"$pos_y\" scale_x=\"$scale_x\" scale_y=\"$scale_y\" rotation=\"$rotation\"/>\n");+			if (background_image.is_valid ()) {+				os.put_string (@"\t<background sha1=\"$(background_image.get_sha1 ())\" x=\"$pos_x\" y=\"$pos_y\" scale_x=\"$scale_x\" scale_y=\"$scale_y\" rotation=\"$rotation\"/>\n");+			} 		} 		 		os.put_string ("</glyph>\n\n"); diff --git a/src/GlyphBackgroundImage.vala b/src/GlyphBackgroundImage.valaindex 81e3673..d52c171 100644--- a/src/GlyphBackgroundImage.vala+++ b/src/GlyphBackgroundImage.vala@@ -122,14 +122,43 @@ class GlyphBackgroundImage { 		return (!) background_image; 	} +	public bool is_valid () {+		File file = File.new_for_path (path);+	+		if (!file.query_exists ()) {+			return false;+		}+		+		var file_info = file.query_info ("*", FileQueryInfoFlags.NONE);+		+		if (file_info.get_size () == 0) {+			return false;+		}+		+		return true;+	}+ 	public string get_png_base64 () { 		try { 			File file = File.new_for_path (path); 			var file_info = file.query_info ("*", FileQueryInfoFlags.NONE); 			uint8[] buffer = new uint8[file_info.get_size ()];-			FileInputStream file_stream = file.read ();-			DataInputStream png_stream = new DataInputStream (file_stream);-+			FileInputStream file_stream;+			DataInputStream png_stream;+			+			if (!file.query_exists ()) {+				warning (@"Failed to save image $path, file does not exist.");+				return "";+			}+			+			if (is_null (buffer)) {+				warning (@"Colud not allocate a buffer of $(file_info.get_size ()) bytes to store $path.");+				return "";+			}+			+			file_stream = file.read ();+			+			png_stream = new DataInputStream (file_stream); 			png_stream.read (buffer); 			 			return Base64.encode (buffer);@@ -154,6 +183,12 @@ class GlyphBackgroundImage { 			} 			 			file_info = file.query_info ("*", FileQueryInfoFlags.NONE);+			+			if (file_info.get_size () == 0) {+				warning (@"length of image $path is zero");+				return "";+			}+			 			buffer = new uint8[file_info.get_size ()]; 			file_stream = file.read (); 			png_stream = new DataInputStream (file_stream);