Fix string to 64-bit integer convertion.

Alexander Korotkov · Alexander Korotkov · commit bedd33f53fa1 · 2016-11-21T12:19:19.000+03:00
diff --git a/src/backend/access/transam/slru.c b/src/backend/access/transam/slru.c
@@ -1377,7 +1377,7 @@ SlruScanDirectory(SlruCtl ctl, SlruScanCallback callback, void *data)
 		if ((len == 12 || len == 13 || len == 14) &&
 			strspn(clde->d_name, "0123456789ABCDEF") == len)
 		{
-			segno = strtoq(clde->d_name, NULL, 16);
+			segno = pg_strtouint64(clde->d_name, NULL, 16);
 			segpage = segno * SLRU_PAGES_PER_SEGMENT;
 
 			elog(DEBUG2, "SlruScanDirectory invoking callback on %s/%s",
diff --git a/src/bin/pg_upgrade/util.c b/src/bin/pg_upgrade/util.c
@@ -267,7 +267,13 @@ str2uint(const char *str)
 uint64
 str2uint64(const char *str)
 {
-	return strtouq(str, NULL, 10);
+#ifdef _MSC_VER					/* MSVC only */
+	return _strtoui64(str, NULL, 10);
+#elif defined(HAVE_STRTOULL) && SIZEOF_LONG < 8
+	return strtoull(str, NULL, 10);
+#else
+	return strtoul(str, NULL, 10);
+#endif
 }
 
 

Original file line number	Diff line number	Diff line change
`@@ -1377,7 +1377,7 @@ SlruScanDirectory(SlruCtl ctl, SlruScanCallback callback, void *data)`
`1377`	`1377`	`if ((len == 12 \|\| len == 13 \|\| len == 14) &&`
`1378`	`1378`	`strspn(clde->d_name, "0123456789ABCDEF") == len)`
`1379`	`1379`	`{`
`1380`		`- segno = strtoq(clde->d_name, NULL, 16);`
	`1380`	`+ segno = pg_strtouint64(clde->d_name, NULL, 16);`
`1381`	`1381`	`segpage = segno * SLRU_PAGES_PER_SEGMENT;`
`1382`	`1382`
`1383`	`1383`	`elog(DEBUG2, "SlruScanDirectory invoking callback on %s/%s",`
Original file line number	Diff line number	Diff line change
`@@ -267,7 +267,13 @@ str2uint(const char *str)`
`267`	`267`	`uint64`
`268`	`268`	`str2uint64(const char *str)`
`269`	`269`	`{`
`270`		`- return strtouq(str, NULL, 10);`
	`270`	`+#ifdef _MSC_VER /* MSVC only */`
	`271`	`+ return _strtoui64(str, NULL, 10);`
	`272`	`+#elif defined(HAVE_STRTOULL) && SIZEOF_LONG < 8`
	`273`	`+ return strtoull(str, NULL, 10);`
	`274`	`+#else`
	`275`	`+ return strtoul(str, NULL, 10);`
	`276`	`+#endif`
`271`	`277`	`}`
`272`	`278`
`273`	`279`