diff --git a/src/webcfg_rbus.c b/src/webcfg_rbus.c
index d01bf862..316390fb 100755
--- a/src/webcfg_rbus.c
+++ b/src/webcfg_rbus.c
@@ -972,11 +972,11 @@ rbusError_t webcfgSubdocForceResetSetHandler(rbusHandle_t handle, rbusProperty_t
             {
                 SubdocResetVal = strdup(data);
                 free(data);
-		char str[256] = {'\0'};
+		char str[MAX_SUBDOC_COUNT * MAX_SUBDOC_NAME_LEN] = {'\0'};
 		int n = 0;
 		webcfgError_t ret = ERROR_FAILURE;
 		char delim[] = ",";
-		char subdocNames[16][16] = {{'\0'}};
+		char subdocNames[MAX_SUBDOC_COUNT][MAX_SUBDOC_NAME_LEN] = {{'\0'}};
 		strncpy(str, SubdocResetVal, sizeof(str)-1);
 		WebcfgInfo("Subdocs need to reset from webconfig DB & tmplist - %s\n",str);
 		char *ptr = strtok(str, delim);
diff --git a/src/webcfg_rbus.h b/src/webcfg_rbus.h
index 4d268c87..a3d678e1 100755
--- a/src/webcfg_rbus.h
+++ b/src/webcfg_rbus.h
@@ -46,6 +46,8 @@
 
 #define MAX_FORCE_RESET_SET_COUNT 3
 #define MAX_FORCE_RESET_TIME_SECS 24*60*60
+#define MAX_SUBDOC_COUNT 16
+#define MAX_SUBDOC_NAME_LEN 32
 
 #define WEBCFG_COMPONENT_NAME "webconfig"
 #define MAX_PARAMETERNAME_LEN			4096