Merge lp:~lool/usplash/misc-fixes into lp:usplash

[Loïc Minier]

=== modified file 'debian/changelog'
--- debian/changelog	2009-06-22 10:49:51 +0000
+++ debian/changelog	2009-08-05 10:27:48 +0000
@@ -1,3 +1,17 @@
+usplash (0.5.33) UNRELEASED; urgency=low
+
+  * Fix return type of strncspn in libusplash.h
+  * Include usplash-theme.h from libusplash.h as it uses struct usplash_theme
+    in declarations.
+  * Include libusplash.h in libusplash.c to ensure sanity of prototypes.
+  * Remove duplicate testcard_theme definition from libusplash.c.
+  * libusplash.c: drop most prototypes for non-static functions which are
+    already declared in libusplash.h.
+  * Add usplash_sanity_check_theme() and use it to reject themes which have a
+    textbox which overflows the theme dimensions; LP: #401432.
+
+ -- Loïc Minier <[e-mail]>  Wed, 05 Aug 2009 11:00:08 +0100
+
 usplash (0.5.32) karmic; urgency=low
 
   * Update Launchpad bug-filing URLs.

=== modified file 'libusplash.c'
--- libusplash.c	2009-03-09 22:06:48 +0000
+++ libusplash.c	2009-08-05 10:27:48 +0000
@@ -57,6 +57,8 @@
 #include "usplash.h"
 #include "usplash-theme.h"
 
+#include "libusplash.h"
+
 /*
  * This shouldn't be needed any more now that animation takes place
  * outside the alarm handler.  However, removing it seems to introduce
@@ -67,24 +69,6 @@
 #define unblocksig() do{ sigprocmask(SIG_UNBLOCK, &sigs, NULL); } while(0)
 
 /* Prototypes of non-static functions */
-void switch_console(int vt, int vt_fd);
-void flush_stdin();
-
-void clear_screen(void);
-
-void clear_progressbar(void);
-void draw_progressbar(int percentage);
-
-void clear_text(void);
-void draw_text(const char *string, size_t len);
-void draw_status(const char *string, size_t len, int mode);
-
-int handle_input(const char *string, size_t len, int quiet);
-int handle_timeout_input(const char *string, size_t len, int quiet,int timeout);
-
-int handle_input_char();
-int handle_verbose(int mode);
-
 /* Helpers for video implementations */
 void usplash_restore_console(void);
 void usplash_save_font(void);
@@ -97,9 +81,6 @@
 static void draw_newline(void);
 static void draw_chars(const char *string, size_t len);
 
-/* Default theme, used when no suitable alternative can be found */
-extern struct usplash_theme testcard_theme;
-
 /* Theme being used */
 struct usplash_theme *theme;
 
@@ -460,6 +441,13 @@
 	return theme->theme_height ? theme->theme_height : theme->pixmap->height;
 }
 
+int usplash_sanity_check_theme(struct usplash_theme* theme)
+{
+	USPLASH_THEME_ASSERT(theme->theme_width && theme->text_x + theme->text_width > theme->theme_width)
+	USPLASH_THEME_ASSERT(theme->theme_width && theme->text_x + theme->text_width > theme->theme_width)
+	return 0;
+}
+
 int usplash_setup(int xres, int yres, int v)
 {
 	int ret;
@@ -526,7 +514,8 @@
 		if (usplash_theme_height(theme) <= yres
 		    && usplash_theme_width(theme) <= xres
 		    && usplash_theme_height(theme) * usplash_theme_width(theme) > maxarea
-		    && theme->ratio == ratio) {
+		    && theme->ratio == ratio
+		    && usplash_sanity_check_theme(theme) == 0) {
 			maxarea = usplash_theme_height(theme) * usplash_theme_width(theme);
 			htheme = theme;
 		}

=== modified file 'libusplash.h'
--- libusplash.h	2009-02-07 14:41:49 +0000
+++ libusplash.h	2009-08-05 10:27:48 +0000
@@ -17,6 +17,8 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA
  */
 
+#include "usplash-theme.h"
+
 void switch_console(int vt, int vt_fd);
 void flush_stdin();
 
@@ -34,8 +36,20 @@
 void request_animate_step();
 void process_pending_animation_steps();
 void animate_step(int pulsating);
+
+#define USPLASH_THEME_ASSERT(expr) \
+	if (expr) { \
+		fprintf(stderr, \
+			"usplash: rejecting theme %s %dx%d (assertion %s failed); please file a bug\n", \
+			USPLASH_THEME, \
+			theme->theme_width, theme->theme_height, \
+			#expr); \
+		return -1; \
+	}
+
+int usplash_sanity_check_theme(struct usplash_theme* theme);
 int usplash_setup(int xres, int yres, int verbose);
-int strncspn(const char *s, size_t n, const char *reject);
+size_t strncspn(const char *s, size_t n, const char *reject);
 int handle_input(const char *string, size_t len, int quiet);
 int handle_timeout_input(const char *string, size_t len, int quiet,int timeout);
 int handle_input_char();
@@ -43,6 +57,7 @@
 int usplash_timeout_get_string(char *inputbuf, int length, int quiet, int inputtimeout);
 #define usplash_get_string(buf,length,quiet) usplash_timeout_get_string(buf,length,quiet,-1)
 
+/* Default theme, used when no suitable alternative can be found */
 extern struct usplash_theme testcard_theme;
 extern struct usplash_theme *theme;
 extern int usplash_xres, usplash_yres;