Merge commit 'e01d84e9aa97102d3b9396c93a92086c40d0f8b6' into PGPRO9_6

dmpgpro · dmpgpro · commit 2cca16bb1a7a · 2016-09-13T13:42:00.000+03:00
diff --git a/contrib/pg_arman/backup.c b/contrib/pg_arman/backup.c
@@ -1108,14 +1108,21 @@ add_files(parray *files, const char *root, bool add_root, bool is_pgdata)
 		file->is_datafile = true;
 		{
 			int find_dot;
+			int check_digit;
 			char *text_segno;
 			for(find_dot = path_len-1; file->path[find_dot] != '.' && find_dot >= 0; find_dot--);
 			if (find_dot <= 0)
 				continue;
 
 			text_segno = file->path + find_dot + 1;
-			/* in future we will need check all chars */
-			if (!isdigit(text_segno[0]))
+			for(check_digit=0; text_segno[check_digit] != '\0'; check_digit++)
+				if (!isdigit(text_segno[check_digit]))
+				{
+					check_digit = -1;
+					break;
+				}
+
+			if (check_digit == -1)
 				continue;
 
 			file->segno = (int) strtol(text_segno, NULL, 10);
