Fossil SCM

Fix a possible NULL-pointer dereference in the "fossil search" command.

drh 2014-01-09 20:59 trunk
Commit 5dc60b1faffeeb68c74d1fc92400f6568204d371
1 file changed +1
--- src/search.c
+++ src/search.c
@@ -106,10 +106,11 @@
106106
int iBonus = 0;
107107
int i, j;
108108
unsigned char seen[8];
109109
110110
memset(seen, 0, sizeof(seen));
111
+ if( zDoc==0 ) return score;
111112
for(i=0; zDoc[i]; i++){
112113
char c = zDoc[i];
113114
if( isBoundary[c&0xff] ) continue;
114115
for(j=0; j<p->nTerm; j++){
115116
int n = p->a[j].n;
116117
--- src/search.c
+++ src/search.c
@@ -106,10 +106,11 @@
106 int iBonus = 0;
107 int i, j;
108 unsigned char seen[8];
109
110 memset(seen, 0, sizeof(seen));
 
111 for(i=0; zDoc[i]; i++){
112 char c = zDoc[i];
113 if( isBoundary[c&0xff] ) continue;
114 for(j=0; j<p->nTerm; j++){
115 int n = p->a[j].n;
116
--- src/search.c
+++ src/search.c
@@ -106,10 +106,11 @@
106 int iBonus = 0;
107 int i, j;
108 unsigned char seen[8];
109
110 memset(seen, 0, sizeof(seen));
111 if( zDoc==0 ) return score;
112 for(i=0; zDoc[i]; i++){
113 char c = zDoc[i];
114 if( isBoundary[c&0xff] ) continue;
115 for(j=0; j<p->nTerm; j++){
116 int n = p->a[j].n;
117

Keyboard Shortcuts

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