summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGravatar Miika Turkia <miika.turkia@gmail.com>2015-07-22 18:06:26 +0300
committerGravatar Dirk Hohndel <dirk@hohndel.org>2015-07-22 11:21:02 -0700
commit2d2d890ac709bd005f28ec1ec1ca48a209945cd2 (patch)
tree75f261227993af0c3a57c15eeb2e6a68e550453f
parentce008f52db2359e042dc54d663b5d37fea6f98c3 (diff)
downloadsubsurface-2d2d890ac709bd005f28ec1ec1ca48a209945cd2.tar.gz
Increase the recursion for Seabear CSV import
Signed-off-by: Miika Turkia <miika.turkia@gmail.com> Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
-rw-r--r--file.c7
1 files changed, 7 insertions, 0 deletions
diff --git a/file.c b/file.c
index 8fca750ac..c955e9ca9 100644
--- a/file.c
+++ b/file.c
@@ -973,6 +973,13 @@ int parse_seabear_csv_file(const char *filename, int timef, int depthf, int temp
char *ptr, *ptr_old = NULL;
char *NL = NULL;
+ /* Increase the limits for recursion and variables on XSLT
+ * parsing */
+ xsltMaxDepth = 30000;
+#if LIBXSLT_VERSION > 10126
+ xsltMaxVars = 150000;
+#endif
+
if (timef >= MAXCOLS || depthf >= MAXCOLS || tempf >= MAXCOLS || po2f >= MAXCOLS || o2sensor1f >= MAXCOLS || o2sensor2f >= MAXCOLS || o2sensor3f >= 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);