diff options
| author | Jörg Frings-Fürst <debian@jff-webhosting.net> | 2018-07-10 23:05:17 +0200 |
|---|---|---|
| committer | Jörg Frings-Fürst <debian@jff-webhosting.net> | 2018-07-10 23:05:17 +0200 |
| commit | c120c7bcbcf115ecc2a6668f4c7f45b3d4a5bc86 (patch) | |
| tree | 5550610553d1b1d7236d052b6e956b22e0bb4883 /app/bin/param.c | |
| parent | 67d0ce65dc6a1d240e271a7cd479b60aa1dc2967 (diff) | |
| parent | 26d299964db18cb71c2c6a5be4864479ba82d54f (diff) | |
Merge branch 'release/debian/5.1.1-1'debian/5.1.1-1
Diffstat (limited to 'app/bin/param.c')
| -rw-r--r-- | app/bin/param.c | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/app/bin/param.c b/app/bin/param.c index e513bc3..47399ee 100644 --- a/app/bin/param.c +++ b/app/bin/param.c @@ -589,9 +589,9 @@ EXPORT void ParamLoadControl( if (p->oldD.s) MyFree( p->oldD.s ); if (p->context) { - p->oldD.s = MyMalloc((intptr_t)p->context); - strncpy(p->oldD.s, (char*)p->valueP, (intptr_t)p->context); - *(p->oldD.s + (intptr_t)p->context - 1) = '\0'; + p->oldD.s = MyMalloc((uint32_t)p->context); + strncpy(p->oldD.s, (char*)p->valueP, (uint32_t)p->context); + *(p->oldD.s + (uint32_t)p->context - 1) = '\0'; wStringSetValue((wString_p)p->control, (char*)p->oldD.s); } else { @@ -730,12 +730,12 @@ EXPORT long ParamUpdate( if (p->oldD.s) MyFree( p->oldD.s ); p->oldD.s = MyStrdup( stringV ); - if ( /*(p->option&PDO_NOUPDUPD)==0 &&*/ p->valueP) { - if (p->context) { - strncpy((char*)p->valueP, stringV, (intptr_t)p->context); - ((char *)p->valueP)[(intptr_t)p->context - 1] = '\0'; - if (strlen(stringV) > (uintptr_t)p->context) { - NoticeMessage2(0, MSG_ENTERED_STRING_TRUNCATED, _("Ok"), NULL, (intptr_t)p->context); + if ( p->valueP ) { + if (p->option & PDO_STRINGLIMITLENGTH ) { + strncpy((char*)p->valueP, stringV, (uint32_t)p->context); + ((char *)p->valueP)[(uint32_t)p->context - 1] = '\0'; + if (strlen(stringV) > (uint32_t)p->context) { + NoticeMessage2(0, MSG_ENTERED_STRING_TRUNCATED, _("Ok"), NULL, (uint32_t)p->context); } } |