diff --git a/src/lib/libutil/fmt_scaled.c b/src/lib/libutil/fmt_scaled.c
index bbeb01fd..76085153 100644
--- a/src/lib/libutil/fmt_scaled.c
+++ b/src/lib/libutil/fmt_scaled.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: fmt_scaled.c,v 1.13 2017/03/11 23:37:23 djm Exp $	*/
+/*	$OpenBSD: fmt_scaled.c,v 1.14 2017/03/15 00:13:18 dtucker Exp $	*/
 
 /*
  * Copyright (c) 2001, 2002, 2003 Ian F. Darwin.  All rights reserved.
@@ -171,6 +171,11 @@ scan_scaled(char *scaled, long long *result)
 				return -1;
 			}
 
+			if (whole <= LLONG_MIN / scale_fact) {
+				errno = ERANGE;
+				return -1;
+			}
+
 			/* scale whole part */
 			whole *= scale_fact;