Author: bursa Date: Mon Apr 30 03:31:38 2007 New Revision: 3258 URL: http://svn.semichrome.net?rev=3D3258&view=3Drev Log: Add a few asserts to catch some bugs. Modified: trunk/netsurf/gtk/gtk_scaffolding.c trunk/netsurf/gtk/gtk_window.c Modified: trunk/netsurf/gtk/gtk_scaffolding.c URL: http://svn.semichrome.net/trunk/netsurf/gtk/gtk_scaffolding.c?rev=3D32= 58&r1=3D3257&r2=3D3258&view=3Ddiff =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D --- trunk/netsurf/gtk/gtk_scaffolding.c (original) +++ trunk/netsurf/gtk/gtk_scaffolding.c Mon Apr 30 03:31:38 2007 @@ -5,6 +5,7 @@ * Copyright 2006 Rob Kendrick <rjek(a)rjek.com&gt; */ = +#include <assert.h> #include <stdbool.h> #include <stdio.h> #include <stdlib.h> @@ -733,6 +734,8 @@ void gui_window_set_status(struct gui_window *_g, const char *text) { struct gtk_scaffolding *g =3D nsgtk_get_scaffold(_g); + assert(g); + assert(g->status_bar); gtk_label_set_text(g->status_bar, text); } = Modified: trunk/netsurf/gtk/gtk_window.c URL: http://svn.semichrome.net/trunk/netsurf/gtk/gtk_window.c?rev=3D3258&r1= =3D3257&r2=3D3258&view=3Ddiff =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D --- trunk/netsurf/gtk/gtk_window.c (original) +++ trunk/netsurf/gtk/gtk_window.c Mon Apr 30 03:31:38 2007 @@ -91,9 +91,12 @@ GtkPolicyType scrollpolicy; = g =3D malloc(sizeof(*g)); - = + if (!g) { + warn_user("NoMemory", 0); + return 0; + } + = LOG(("Creating gui window %p for browser window %p", g, bw)); - = = g->bw =3D bw; g->current_pointer =3D GUI_POINTER_DEFAULT; @@ -250,8 +253,18 @@ GdkEventExpose *event, gpointer data) { struct gui_window *g =3D data; - struct content *c =3D g->bw->current_content; - = + struct content *c; + + assert(g); + assert(g->bw); + + struct gui_window *z; + for (z =3D window_list; z && z !=3D g; z =3D z->next) + continue; + assert(z); + assert(g->drawing_area =3D=3D widget); + + c =3D g->bw->current_content; if (c =3D=3D NULL) return FALSE; =