xfnw/plan9fox
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

mothra: clicking on the url scroll bar, snarfing, or saving a hit when no urls have been loaded (right after running mothra) would crash. this was due to use of w->url and selection when they are actually nil.

Browse source 
to fix this, make genwww return 0 if w->url is nil and output an error message when attempting to access selection if it's nil. the problem with the w->url fix is that after clicking on the url scroll bar, an empty url history row could be highlighted by clicking on it. fix this by making sure lp->lo is not less than zero.
This commit is contained in:
ppatience0 2013-05-27 00:26:19 -04:00
parent ffef3278ef
commit 6a0d21acca
2 changed files with 12 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
sys/src/cmd/mothra/libpanel/list.c
View file

@ -22,7 +22,7 @@ void pl_listsel(Panel *p, int sel, int on){
Rectangle r;
lp=p->data;
hi=lp->lo+(lp->listr.max.y-lp->listr.min.y)/font->height;
if(lp->lo<=sel && sel<hi && sel<lp->len){
if(lp->lo>=0 && lp->lo<=sel && sel<hi && sel<lp->len){
r=lp->listr;
r.min.y+=(sel-lp->lo)*font->height;
r.max.y=r.min.y+font->height;

13
sys/src/cmd/mothra/mothra.c
View file

@ -484,6 +484,8 @@ char *genwww(Panel *, int index){
return 0;
i = wwwtop-index-1;
w = www(i);
if(!w->url)
return 0;
if(w->title[0]!='\0'){
w->gottitle=1;
snprint(buf, sizeof(buf), "%2d %s", i+1, w->title);
@ -1027,8 +1029,11 @@ void killpix(Www *w){
}
void snarf(Panel *p){
if(p==0 || p==cmd){
plputsnarf(urlstr(selection));
plsnarf(text);
if(selection){
plputsnarf(urlstr(selection));
plsnarf(text);
}else
message("no url selected");
}else
plsnarf(p);
}
@ -1070,6 +1075,10 @@ void hit3(int button, int item){
paste(plkbfocus);
break;
case 4:
if(!selection){
message("no url selected");
break;
}
snprint(name, sizeof(name), "%s/hit.html", home);
fd=open(name, OWRITE);
if(fd==-1){