aboutsummaryrefslogtreecommitdiffhomepage
path: root/src
diff options
context:
space:
mode:
authorRalph Amissah <ralph@amissah.com>2017-09-27 18:05:34 -0400
committerRalph Amissah <ralph@amissah.com>2019-04-10 15:14:14 -0400
commitca5f6f3d4bf53a00f81c5323325b2e4e40489aeb (patch)
tree9b6679dbd5d1066ac6664a0c212f0a8b6eac2d24 /src
parentmeta_abstraction, work on ocn (diff)
fix for: gdc compiled program when run, segfaults on certain actions
Diffstat (limited to 'src')
-rw-r--r--src/sdp/meta/metadoc_from_src.d8
-rw-r--r--src/sdp/output/xmls.d4
2 files changed, 5 insertions, 7 deletions
diff --git a/src/sdp/meta/metadoc_from_src.d b/src/sdp/meta/metadoc_from_src.d
index 82c6249..920e7af 100644
--- a/src/sdp/meta/metadoc_from_src.d
+++ b/src/sdp/meta/metadoc_from_src.d
@@ -355,6 +355,7 @@ template SiSUdocAbstraction() {
/+ ↓ loop markup document/text line by line +/
srcDocLoop:
foreach (line; markup_sourcefile_content) {
+ // "line" variable can be empty but should never be null
/+ ↓ markup document/text line by line +/
/+ scope +/
scope(exit) {
@@ -890,10 +891,7 @@ template SiSUdocAbstraction() {
processing.remove("verse");
++cntr;
} else {
- assert(
- line == null,
- "line variable should be empty, should not occur"
- );
+ // could be useful to test line variable should be empty and never null
}
} // close else for line empty
} // close else for not the above
@@ -3418,7 +3416,7 @@ template SiSUdocAbstraction() {
col_num_ = idx_c;
_table_substantive ~= col ~ mng.tc_s;
if (idx_r == 0 && comp_obj_block.table_heading) {
- } else if (idx_r == 1 && col.match(rgx.numeric_col)) {
+ } else if (col.match(rgx.numeric_col) && idx_r == 1) { // conditions reversed to avoid: gdc compiled program run segfault
if ((comp_obj_block.table_column_aligns.length > idx_c)
&& (comp_obj_block.table_column_aligns[idx_c].matchFirst(rgx.table_col_align_match))) {
comp_obj_block.table_column_aligns[idx_c]
diff --git a/src/sdp/output/xmls.d b/src/sdp/output/xmls.d
index 1181c6f..c100bbc 100644
--- a/src/sdp/output/xmls.d
+++ b/src/sdp/output/xmls.d
@@ -306,8 +306,8 @@ template outputXHTMLs() {
string seg_scroll = "seg",
) {
if (obj.inline_links) {
- if ((seg_scroll == "scroll")
- && _txt.match(rgx.mark_internal_site_lnk)) {
+ if ((_txt.match(rgx.mark_internal_site_lnk))
+ && (seg_scroll == "scroll")) { // conditions reversed to avoid: gdc compiled program run segfault
_txt = (_txt).replaceAll(
rgx.inline_seg_link,
"$1");