summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGravatar Miika Turkia <miika.turkia@gmail.com>2015-02-08 22:37:38 +0200
committerGravatar Dirk Hohndel <dirk@hohndel.org>2015-02-10 15:03:28 -0800
commitf39962469d726d6ae7e13931763b3e13c59d626a (patch)
treee2121ea668a1b51c60a683aa9b2d9d800ccb8426
parent01199728fbf7ad16613d1041245859ec684d186e (diff)
downloadsubsurface-f39962469d726d6ae7e13931763b3e13c59d626a.tar.gz
Increase the limits for recursion and variables on XSLT parsing
This increases the limits when parsing CSV files with dive profiles, allowing us to import bigger files in one go. Signed-off-by: Miika Turkia <miika.turkia@gmail.com> Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
-rw-r--r--file.c5
1 files changed, 5 insertions, 0 deletions
diff --git a/file.c b/file.c
index e03edaf82..b9cd5ba21 100644
--- a/file.c
+++ b/file.c
@@ -866,6 +866,11 @@ int parse_csv_file(const char *filename, int timef, int depthf, int tempf, int p
char curtime[TIMESTR];
int previous;
+ /* Increase the limits for recursion and variables on XSLT
+ * parsing */
+ xsltMaxDepth = 30000;
+ xsltMaxVars = 150000;
+
if (timef >= MAXCOLS || depthf >= MAXCOLS || tempf >= MAXCOLS || po2f >= MAXCOLS || cnsf >= MAXCOLS || ndlf >= MAXCOLS || cnsf >= MAXCOLS || stopdepthf >= MAXCOLS || pressuref >= MAXCOLS)
return report_error(translate("gettextFromC", "Maximum number of supported columns on CSV import is %d"), MAXCOLS);