Fossil SCM

Don't access g.argv[2], when g.argc indicates there's no such element. Reported by Tony Papadimitriou.

jan.nijtmans 2017-05-11 09:06 trunk
Commit 2d69772e49f3122e3c6c77d3da24ae7c251ea10040736e52c66d539ea29b21aa
1 file changed +1 -1
+1 -1
--- src/search.c
+++ src/search.c
@@ -597,11 +597,11 @@
597597
}else{
598598
width = -1;
599599
}
600600
601601
db_find_and_open_repository(0, 0);
602
- if( g.argc<2 ) return;
602
+ if( g.argc<3 ) return;
603603
blob_init(&pattern, g.argv[2], -1);
604604
for(i=3; i<g.argc; i++){
605605
blob_appendf(&pattern, " %s", g.argv[i]);
606606
}
607607
(void)search_init(blob_str(&pattern),"*","*","...",SRCHFLG_STATIC);
608608
--- src/search.c
+++ src/search.c
@@ -597,11 +597,11 @@
597 }else{
598 width = -1;
599 }
600
601 db_find_and_open_repository(0, 0);
602 if( g.argc<2 ) return;
603 blob_init(&pattern, g.argv[2], -1);
604 for(i=3; i<g.argc; i++){
605 blob_appendf(&pattern, " %s", g.argv[i]);
606 }
607 (void)search_init(blob_str(&pattern),"*","*","...",SRCHFLG_STATIC);
608
--- src/search.c
+++ src/search.c
@@ -597,11 +597,11 @@
597 }else{
598 width = -1;
599 }
600
601 db_find_and_open_repository(0, 0);
602 if( g.argc<3 ) return;
603 blob_init(&pattern, g.argv[2], -1);
604 for(i=3; i<g.argc; i++){
605 blob_appendf(&pattern, " %s", g.argv[i]);
606 }
607 (void)search_init(blob_str(&pattern),"*","*","...",SRCHFLG_STATIC);
608

Keyboard Shortcuts

Open search /
Next entry (timeline) j
Previous entry (timeline) k
Open focused entry Enter
Show this help ?
Toggle theme Top nav button