From c05101bb3f8d9bf2ed984e85fde8bcb27402054a Mon Sep 17 00:00:00 2001 From: Andrew Johnson Date: Tue, 6 Mar 2018 18:23:34 -0600 Subject: [PATCH] Make dbGetString() fetch link fields properly before iocInit --- src/ioc/dbStatic/dbStaticLib.c | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/src/ioc/dbStatic/dbStaticLib.c b/src/ioc/dbStatic/dbStaticLib.c index 963b452f1..69a4a6d1b 100644 --- a/src/ioc/dbStatic/dbStaticLib.c +++ b/src/ioc/dbStatic/dbStaticLib.c @@ -1928,6 +1928,8 @@ char * dbGetString(DBENTRY *pdbentry) case CONSTANT: if (plink->value.constantStr) { dbMsgCpy(pdbentry, plink->value.constantStr); + } else if (plink->text) { + dbMsgCpy(pdbentry, plink->text); } else { dbMsgCpy(pdbentry, ""); } @@ -2028,7 +2030,13 @@ char * dbGetString(DBENTRY *pdbentry) switch(plink->type) { case CONSTANT: - dbMsgCpy(pdbentry, "0"); + if (plink->value.constantStr) { + dbMsgCpy(pdbentry, plink->value.constantStr); + } else if (plink->text) { + dbMsgCpy(pdbentry, plink->text); + } else { + dbMsgCpy(pdbentry, ""); + } break; case MACRO_LINK: if (plink->value.macro_link.macroStr) {