1 files changed, 6 insertions, 1 deletions

diff --git a/openbsd-compat/fmt_scaled.c b/openbsd-compat/fmt_scaled.c
index e5533b2de..7e6a57d45 100644
--- a/openbsd-compat/fmt_scaled.c
+++ b/openbsd-compat/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.
@@ -175,6 +175,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;