diff options
| author | ppatience0 <ppatience0@gmail.com> | 2013-05-27 00:26:19 -0400 |
|---|---|---|
| committer | ppatience0 <ppatience0@gmail.com> | 2013-05-27 00:26:19 -0400 |
| commit | 6a0d21acca616aa4cf11468e3dc6f1c052e1d94f (patch) | |
| tree | dcdf99efc6323a8f9a683a9479ff32c71dcb8382 | |
| parent | ffef3278efa4b923b29005c881e23385f46b3222 (diff) | |
| download | plan9front-6a0d21acca616aa4cf11468e3dc6f1c052e1d94f.tar.xz | |
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.
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.
| -rw-r--r-- | sys/src/cmd/mothra/libpanel/list.c | 2 | ||||
| -rw-r--r-- | sys/src/cmd/mothra/mothra.c | 13 |
2 files changed, 12 insertions, 3 deletions
diff --git a/sys/src/cmd/mothra/libpanel/list.c b/sys/src/cmd/mothra/libpanel/list.c index fb9b676f7..8f4b0766f 100644 --- a/sys/src/cmd/mothra/libpanel/list.c +++ b/sys/src/cmd/mothra/libpanel/list.c @@ -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; diff --git a/sys/src/cmd/mothra/mothra.c b/sys/src/cmd/mothra/mothra.c index d1d06abe3..79e6191d2 100644 --- a/sys/src/cmd/mothra/mothra.c +++ b/sys/src/cmd/mothra/mothra.c @@ -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){ |