Fix bug in MtmSplitConnStrs

knizhnik · knizhnik · commit 94158ef2ba8a · 2016-03-22T13:22:52.000+03:00
diff --git a/contrib/mmts/multimaster.c b/contrib/mmts/multimaster.c
@@ -1208,7 +1208,8 @@ void MtmUpdateNodeConnStr(int nodeId, char const* connStr)
 static void MtmSplitConnStrs(void)
 {
 	int i;
-    char* connStr = strdup(MtmConnStrs);
+	char* copy =  strdup(MtmConnStrs);
+    char* connStr = copy;
     char* connStrEnd = connStr + strlen(connStr);
 
 	for (i = 0; connStr < connStrEnd; i++) { 
@@ -1237,7 +1238,7 @@ static void MtmSplitConnStrs(void)
 		}
 		connStr = p + 1;
     }
-	free(connStr);
+	free(copy);
 	if (i < 2) { 
         elog(ERROR, "Multimaster should have at least two nodes");
 	}	

Original file line number	Diff line number	Diff line change
`@@ -1208,7 +1208,8 @@ void MtmUpdateNodeConnStr(int nodeId, char const* connStr)`
`1208`	`1208`	`static void MtmSplitConnStrs(void)`
`1209`	`1209`	`{`
`1210`	`1210`	`int i;`
`1211`		`- char* connStr = strdup(MtmConnStrs);`
	`1211`	`+ char* copy = strdup(MtmConnStrs);`
	`1212`	`+ char* connStr = copy;`
`1212`	`1213`	`char* connStrEnd = connStr + strlen(connStr);`
`1213`	`1214`
`1214`	`1215`	`for (i = 0; connStr < connStrEnd; i++) {`
`@@ -1237,7 +1238,7 @@ static void MtmSplitConnStrs(void)`
`1237`	`1238`	`}`
`1238`	`1239`	`connStr = p + 1;`
`1239`	`1240`	`}`
`1240`		`- free(connStr);`
	`1241`	`+ free(copy);`
`1241`	`1242`	`if (i < 2) {`
`1242`	`1243`	`elog(ERROR, "Multimaster should have at least two nodes");`
`1243`	`1244`	`}`