Merge ~info-martin-konrad/epics-base:backport-fix-for-lp1776141 into ~epics-core/epics-base/+git/epics-base:3.15

Proposed by Martin Konrad
Status: Merged
Approved by: Andrew Johnson
Approved revision: 7632c355eee6dc72dfecec2295f93e853a9524ad
Merged at revision: 7632c355eee6dc72dfecec2295f93e853a9524ad
Proposed branch: ~info-martin-konrad/epics-base:backport-fix-for-lp1776141
Merge into: ~epics-core/epics-base/+git/epics-base:3.15
Diff against target: 28 lines (+3/-2)
1 file modified
src/ioc/db/dbTest.c (+3/-2)
Reviewer Review Type Date Requested Status
Andrew Johnson Approve
Review via email: mp+393873@code.launchpad.net

Description of the change

Backported 6761726e956e2add0558a8a8814253c7bc10a86b from 7.0 branch. Fixes LP #1776141.

To post a comment you must log in.
Revision history for this message
Andrew Johnson (anj) wrote :

Thanks.

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1diff --git a/src/ioc/db/dbTest.c b/src/ioc/db/dbTest.c
2index 7f4f77b..f63e671 100644
3--- a/src/ioc/db/dbTest.c
4+++ b/src/ioc/db/dbTest.c
5@@ -41,12 +41,13 @@
6 #include "special.h"
7
8 #define MAXLINE 80
9+#define MAXMESS 128
10 struct msgBuff { /* line output structure */
11 char out_buff[MAXLINE + 1];
12 char *pNext;
13 char *pLast;
14 char *pNexTab;
15- char message[128];
16+ char message[MAXMESS];
17 };
18 typedef struct msgBuff TAB_BUFFER;
19
20@@ -1205,7 +1206,7 @@ static int dbpr_report(
21 sprintf(pmsg,"%s: Illegal Link Type", pfield_name);
22 }
23 else {
24- sprintf(pmsg,"%s:%s %s", pfield_name,
25+ epicsSnprintf(pmsg, MAXMESS, "%s:%s %s", pfield_name,
26 pamaplinkType[ind].strvalue,dbGetString(pdbentry));
27 }
28 dbpr_msgOut(pMsgBuff, tab_size);

Subscribers

People subscribed via source and target branches