From a7605df14b7346efc0023f14cc76694f32a75aab Mon Sep 17 00:00:00 2001 From: Alan Date: Wed, 31 Aug 2022 15:04:45 +0800 Subject: [PATCH] fix segfault on empty prop key value --- debian/autoreconf.after | 6 +++--- debian/autoreconf.before | 4 ++-- src/JsRender/NodeProp.vala | 3 +++ 3 files changed, 8 insertions(+), 5 deletions(-) diff --git a/debian/autoreconf.after b/debian/autoreconf.after index 1a0ef4722..82f5446d3 100644 --- a/debian/autoreconf.after +++ b/debian/autoreconf.after @@ -54,7 +54,7 @@ dad0227408777290e6c56afc03cf6e12 ./src/Builder4/.deps/WindowLeftProjects.Po 3240de25cec411f70a664d60a863a5bf ./src/Builder4/.deps/ValaProjectSettings.Po eac560ca8d937023d780ae709733ee95 ./src/Builder4/.deps/ProjectSettings.Po 037af1aa13ae4ac7a33522b32713e2a5 ./src/Builder4/ValaCompileResults.vala -469451c6fc87aaf8b6c28f88860bb55a ./src/Builder4/About.bjs +b4ef19eba6bf0ad81db687f350ed0b1e ./src/Builder4/About.bjs 9f22d2c6d4ac12e071bed5503e4da569 ./src/Builder4/DialogSaveTemplate.vala b6cd6ab7659c7b11f49577cd611d3752 ./src/Builder4/ValaProjectSettings.bjs 0fc9ff3b75b4d5d382666b311ea9df13 ./src/Builder4/WindowAddProp.bjs @@ -68,7 +68,7 @@ dc7e9528040b3bb485f1e9f69df9b5a6 ./src/Builder4/ClutterFiles.c 4bfb083983d5e2d3b0b0ec63c2484dc3 ./src/Builder4/WindowLeftProps.vala 44a1921066534c10a2aac94e63e1dd1a ./src/Builder4/WindowRightPalete.vala 93a33b5be53d1eeb3a1017a9c00fbce1 ./src/Builder4/GladeView.vala -ed2b93a30dbd21b47754963fa7c1ff3f ./src/Builder4/About.vala +4c67603332b58d27df89a19bb7a0e0ae ./src/Builder4/About.vala cd39567c86afd25c6b982e47d4a4850f ./src/Builder4/ClutterFiles.vala fb71cc9a6b22c171ea2034fdcf15aa94 ./src/Builder4/WindowAddProp.vala e48faad93a150ef9bdac43a28013e533 ./src/Builder4/MainWindow.bjs @@ -237,7 +237,7 @@ d743438c4e4b765b7ce4b7e1c98b3b31 ./config.h.in~ 9580a33f9516167b4a1a72fe4fee31ae ./.gitignore 737061c1c974f84326be8b9281180af9 ./README.md 959bffe2993816eb32ec4bc1ec1d5875 ./LICENSE -d8d69f78270e949e97ab2d89bb2bc7ee ./autom4te.cache/requests +2cfe346e64cead6f7cb807b27573b042 ./autom4te.cache/requests 4ab5d64b369bac36c4c5ea81ef5e82f1 ./autom4te.cache/traces.2 4ab5d64b369bac36c4c5ea81ef5e82f1 ./autom4te.cache/traces.1 35d73aa64bd0b12a1f9172b40e9f62b2 ./autom4te.cache/output.1 diff --git a/debian/autoreconf.before b/debian/autoreconf.before index 209891b61..7835c8f64 100644 --- a/debian/autoreconf.before +++ b/debian/autoreconf.before @@ -52,7 +52,7 @@ dad0227408777290e6c56afc03cf6e12 ./src/Builder4/.deps/WindowLeftProjects.Po 3240de25cec411f70a664d60a863a5bf ./src/Builder4/.deps/ValaProjectSettings.Po eac560ca8d937023d780ae709733ee95 ./src/Builder4/.deps/ProjectSettings.Po 037af1aa13ae4ac7a33522b32713e2a5 ./src/Builder4/ValaCompileResults.vala -469451c6fc87aaf8b6c28f88860bb55a ./src/Builder4/About.bjs +b4ef19eba6bf0ad81db687f350ed0b1e ./src/Builder4/About.bjs 9f22d2c6d4ac12e071bed5503e4da569 ./src/Builder4/DialogSaveTemplate.vala b6cd6ab7659c7b11f49577cd611d3752 ./src/Builder4/ValaProjectSettings.bjs 0fc9ff3b75b4d5d382666b311ea9df13 ./src/Builder4/WindowAddProp.bjs @@ -66,7 +66,7 @@ dc7e9528040b3bb485f1e9f69df9b5a6 ./src/Builder4/ClutterFiles.c 4bfb083983d5e2d3b0b0ec63c2484dc3 ./src/Builder4/WindowLeftProps.vala 44a1921066534c10a2aac94e63e1dd1a ./src/Builder4/WindowRightPalete.vala 93a33b5be53d1eeb3a1017a9c00fbce1 ./src/Builder4/GladeView.vala -ed2b93a30dbd21b47754963fa7c1ff3f ./src/Builder4/About.vala +4c67603332b58d27df89a19bb7a0e0ae ./src/Builder4/About.vala cd39567c86afd25c6b982e47d4a4850f ./src/Builder4/ClutterFiles.vala fb71cc9a6b22c171ea2034fdcf15aa94 ./src/Builder4/WindowAddProp.vala e48faad93a150ef9bdac43a28013e533 ./src/Builder4/MainWindow.bjs diff --git a/src/JsRender/NodeProp.vala b/src/JsRender/NodeProp.vala index 17bc0763d..61c0f1dc0 100644 --- a/src/JsRender/NodeProp.vala +++ b/src/JsRender/NodeProp.vala @@ -142,6 +142,9 @@ public class JsRender.NodeProp : Object { public string to_json_key() { + if (this.rtype == null) { // not sure why this happens.!? + this.rtype = ""; + } var ortype = this.rtype + (this.rtype.length > 0 ? " " : ""); var oabbr = NodePropType.to_abbr(this.ptype); if (oabbr.length > 0) { -- 2.39.2