Re: Dasher freeze break request

[Murray Cumming <murrayc murrayc com>]

On Mon, 2005-03-07 at 19:13 +0000, Matthew Garrett wrote:
> The attached patches to dasher fix one crash bug

Crashes are bad. 1 of 2 approvals.

>  and clean up an obvious
> error that could cause undefined behaviour. Bugzilla bugs are 168945 and
> 169458. 
> 
> Index: accessibility.cc
> ===================================================================
> RCS file: /cvs/gnome/dasher/Src/Gtk2/accessibility.cc,v
> retrieving revision 1.25
> diff -u -p -r1.25 accessibility.cc
> --- accessibility.cc	30 Jan 2005 15:53:34 -0000	1.25
> +++ accessibility.cc	7 Mar 2005 19:08:43 -0000
> @@ -455,6 +455,12 @@ ControlTree* buildwindowtree()
>  
>  	}
>  	
> +	if (tmptree->parent == NULL) {
> +	  /* wnck didn't provide us with any windows */
> +	  delete tmptree;
> +	  return NULL;
> +	}
> +
>  	tmptree->parent->next = NULL;
>  	delete tmptree;
>  	return firstchild;
> Index: edit.cc
> ===================================================================
> RCS file: /cvs/gnome/dasher/Src/Gtk2/edit.cc,v
> retrieving revision 1.14
> diff -u -p -r1.14 edit.cc
> --- edit.cc	7 Mar 2005 18:36:06 -0000	1.14
> +++ edit.cc	7 Mar 2005 19:08:43 -0000
> @@ -421,7 +421,7 @@ void edit_delete_forward_character()
>  #ifdef GNOME_A11Y
>    if (textbox!=NULL) {
>      int startpos=AccessibleText_getCaretOffset(textbox);
> -    int endpos=endpos+1;      
> +    int endpos=startpos+1;      
>      AccessibleEditableText_deleteText(edittextbox,startpos,endpos);
>    }
>  #endif
> 
-- 
Murray Cumming
murrayc murrayc com
www.murrayc.com
www.openismus.com