- Don't nul-terminate after snprintf(), it does it already

- Use strlcpy()

diff --git a/modules/control/http/macro.c b/modules/control/http/macro.c
index 3c817f3a1f64053ae3c99ac1b486035715756023..60c5454248d60e518859e406abe7653cc9bf0daf 100644 (file)
--- a/modules/control/http/macro.c
+++ b/modules/control/http/macro.c
@@ -725,9 +725,8 @@ void E_(MacroDo)( httpd_file_sys_t *p_args,
                     psz = config_GetPsz( p_intf, m->param1 );
                     if( psz != NULL )
                     {
-                        strncpy( value, psz,sizeof( value ) );
+                        strlcpy( value, psz,sizeof( value ) );
                         free( psz );
-                        value[sizeof( value ) - 1] = '\0';
                     }
                     else
                         *value = '\0';
@@ -736,7 +735,6 @@ void E_(MacroDo)( httpd_file_sys_t *p_args,
                 default:
                     snprintf( value, sizeof( value ),
                               "invalid type(%s) in set", m->param2 );
-                    value[sizeof( value ) - 1] = '\0';
                     break;
             }
             PRINTS( "%s", value );