fix more undefined behavior

1 files changed, 14 insertions, 6 deletions

diff --git a/vespalib/src/vespa/vespalib/stllike/asciistream.cpp b/vespalib/src/vespa/vespalib/stllike/asciistream.cpp
index 6b673363d2d..c8ff6f4dd4b 100644
--- a/vespalib/src/vespa/vespalib/stllike/asciistream.cpp
+++ b/vespalib/src/vespa/vespalib/stllike/asciistream.cpp
@@ -429,22 +429,30 @@ printInt(unsigned long long r, char * tmp, uint8_t i)
     return i;
 }
 
+unsigned long long normalize(long long v, bool &negative) {
+    if (v < 0) {
+        negative = true;
+        if (v == std::numeric_limits<long long>::min()) {
+            return v;
+        }
+        return -v;
+    }
+    return v;
+}
+
 }
 
 
 asciistream &
-asciistream::operator << (long long v)
+asciistream::operator << (long long v_in)
 {
     char tmp[72];
     uint8_t i(sizeof(tmp));
     bool negative(false);
-    if (v == 0) {
+    if (v_in == 0) {
         tmp[--i] = '0';
     } else {
-        if (v < 0) {
-            v = -v;
-            negative = true;
-        }
+        unsigned long long v = normalize(v_in, negative);
         switch (_base) {
           case 2:
             i = printInt<2>(v, tmp, i); break;