From 073966825bfa78dea87857637a16c8fe029d5bb8 Mon Sep 17 00:00:00 2001 From: Tindy X <49061470+tindy2013@users.noreply.github.com> Date: Sat, 6 Jun 2020 14:47:59 +0800 Subject: [PATCH] Fix sort_script causing program crash --- src/interfaces.cpp | 2 +- src/subexport.cpp | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/src/interfaces.cpp b/src/interfaces.cpp index ac7efe3..9810152 100644 --- a/src/interfaces.cpp +++ b/src/interfaces.cpp @@ -1268,7 +1268,7 @@ std::string subconverter(RESPONSE_CALLBACK_ARGS) ext.skip_cert_verify.define(scv_flag); ext.sort_flag = sort_flag.get(do_sort); - use_sort_script.define(sort_script.size()); + use_sort_script.define(sort_script.size() != 0); if(ext.sort_flag && use_sort_script) ext.sort_script = sort_script; ext.filter_deprecated = fdn.get(filter_deprecated); diff --git a/src/subexport.cpp b/src/subexport.cpp index df4e115..e28ae33 100644 --- a/src/subexport.cpp +++ b/src/subexport.cpp @@ -1023,6 +1023,7 @@ void preprocessNodes(std::vector &nodes, extra_settings &ext) duktape_push_nodeinfo(ctx, a); duktape_push_nodeinfo(ctx, b); /// call function + duk_pcall(ctx, 2); return duktape_get_res_int(ctx); }; std::sort(nodes.begin(), nodes.end(), comparer);