fixing search to handle bad regexps without killing the server. fixed search to not loop forever on bad searches that return nothing.

1 files changed, 13 insertions, 6 deletions

diff --git a/src/server/ApiManagers/SearchManager.ts b/src/server/ApiManagers/SearchManager.ts
index a52430ee8..531f3706c 100644
--- a/src/server/ApiManagers/SearchManager.ts
+++ b/src/server/ApiManagers/SearchManager.ts
@@ -47,13 +47,20 @@ export class SearchManager extends ApiManager {
                 const resObj: { ids: string[], numFound: number, lines: string[] } = { ids: [], numFound: 0, lines: [] };
                 let results: any;
                 const dir = pathToDirectory(Directory.text);
-                results = await findInFiles.find({ 'term': q, 'flags': 'ig' }, dir, ".txt$");
-                for (const result in results) {
-                    resObj.ids.push(path.basename(result, ".txt").replace(/upload_/, ""));
-                    resObj.lines.push(results[result].line);
-                    resObj.numFound++;
+                try {
+                    const regex = new RegExp(q.toString());
+                    results = await findInFiles.find({ 'term': q, 'flags': 'ig' }, dir, ".txt$");
+                    for (const result in results) {
+                        resObj.ids.push(path.basename(result, ".txt").replace(/upload_/, ""));
+                        resObj.lines.push(results[result].line);
+                        resObj.numFound++;
+                    }
+                    res.send(resObj);
+                } catch (e) {
+                    console.log("textsearch: received bad RegExp" + q.toString())
+                    res.send([]);
+                    return;
                 }
-                res.send(resObj);
             }
         });