check returned length of snprintf to avoid overflow

libserverframe.spec

@@ -2,7 +2,7 @@
 %define CommitVersion %(echo $COMMIT_VERSION)
 
 Name: libserverframe
-Version: 1.2.14
+Version: 1.2.15
 Release: 1%{?dist}
 Summary: network framework library
 License: AGPL v3.0
@@ -12,9 +12,9 @@ Source: http://github.com/happyfish100/libserverframe/%{name}-%{version}.tar.gz
 
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
-BuildRequires: libfastcommon-devel >= 1.0.86
+BuildRequires: libfastcommon-devel >= 1.0.88
 Requires: %__cp %__mv %__chmod %__grep %__mkdir %__install %__id
-Requires: libfastcommon >= 1.0.86
+Requires: libfastcommon >= 1.0.88
 
 %description
 common framework library 

src/sf_global.c

@@ -161,9 +161,9 @@ int sf_load_log_config(IniFullContext *ini_ctx, LogContext *log_ctx,
 {
     int result;
 
-    log_cfg->sync_log_buff_interval = iniGetIntValueEx(
+    log_cfg->sync_log_buff_interval = iniGetTimestampValueEx(
             ini_ctx->section_name, "sync_log_buff_interval",
-            ini_ctx->context, SF_DEF_SYNC_LOG_BUFF_INTERVAL, true);
+            ini_ctx->context, SF_DEF_SYNC_LOG_BUFF_INTERVAL, 1, true);
     if (log_cfg->sync_log_buff_interval <= 0) {
         log_cfg->sync_log_buff_interval = SF_DEF_SYNC_LOG_BUFF_INTERVAL;
     }
@@ -968,6 +968,9 @@ void sf_context_config_to_string(const SFContext *sf_context,
                 sock_handler->inner.port, inner_bind_addr,
                 sock_handler->outer.port, outer_bind_addr);
     }
+    if (len >= size) {
+        return;
+    }
 
     len += snprintf(output + len, size - len,
             ", address_family=%s, accept_threads=%d, work_threads=%d",
@@ -975,6 +978,9 @@ void sf_context_config_to_string(const SFContext *sf_context,
             sf_context->accept_threads, sf_context->work_threads);
 
 #if IOEVENT_USE_URING
+    if (len >= size) {
+        return;
+    }
     len += snprintf(output + len, size - len, ", use_io_uring=%d, "
             "use_send_zc=%d", sf_context->use_io_uring,
             sf_context->use_send_zc);
@@ -1072,11 +1078,17 @@ void sf_global_config_to_string_ex(const char *max_pkg_size_item_nm,
             g_sf_global_vars.thread_stack_size / 1024, pkg_buff);
 
 #if IOEVENT_USE_URING
+    if (len >= size) {
+        return;
+    }
     len += snprintf(output + len, size - len, "use_io_uring=%d, "
             "use_send_zc=%d, ", g_sf_context.use_io_uring,
             g_sf_context.use_send_zc);
 #endif
 
+    if (len >= size) {
+        return;
+    }
     len += snprintf(output + len, size - len,
             "tcp_quick_ack=%d, "
             "log_level=%s, "
@@ -1085,6 +1097,9 @@ void sf_global_config_to_string_ex(const char *max_pkg_size_item_nm,
             log_get_level_caption(),
             g_sf_global_vars.run_by.group,
             g_sf_global_vars.run_by.user);
+    if (len >= size) {
+        return;
+    }
 
     sf_log_config_to_string(&g_sf_global_vars.error_log,
             "error-log", output + len, size - len);

src/sf_util.c

@@ -95,7 +95,7 @@ int sf_printbuffer(char* buffer,int32_t len)
 void sf_usage_ex(const char *program, const SFCMDOption *other_options)
 {
     fprintf(stderr, "\nUsage: %s [options] <config_file> "
-            "[start | stop | restart | status]\n\noptions:\n", program);
+            "[start | stop | restart | status]\n\nOptions:\n", program);
 
     if (other_options != NULL) {
         const SFCMDOption *option;

src/sf_version.h

@@ -22,7 +22,7 @@
 
 #define SF_MAJOR_VERSION   1
 #define SF_MINOR_VERSION   2
-#define SF_PATCH_VERSION  14
+#define SF_PATCH_VERSION  15
 
 #define SF_VERSION_INT  FC_VERSION_TO_INT(SF_MAJOR_VERSION, \
         SF_MINOR_VERSION, SF_PATCH_VERSION)