From: Andrew Cooper <andrew.cooper3@citrix.com>
Date: Thu, 21 Apr 2016 13:47:12 +0000 (+0100)
Subject: xen/vsprintf: Avoid returning NULL from number()
X-Git-Tag: archive/raspbian/4.8.0-1+rpi1~1^2~1000
X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=ce34d6b036ed84b12da6cd90a40a1302df4f1fef;p=xen.git

xen/vsprintf: Avoid returning NULL from number()

In practice this is an unused codepath, as every caller of number() passes an
explicit base of 8, 10 or 16.  For all other uses, number() returns a pointer
between the str and end parameters, as do the other similar helper functions.

However, the fact that there is a NULL return path causes Coverity to check
whether the caller makes NULL checks on the return value, and complain.

Change the conditional return into an ASSERT().

No functional change, but this removes 21 instances of NULL_RETURN in
Coverity.

Signed-off-by: Andrew Cooper <andrew.cooper3@citrix.com>
---
CC: Jan Beulich <JBeulich@suse.com>
---

diff --git a/xen/common/vsprintf.c b/xen/common/vsprintf.c
index b050ea3776..f92fb675e6 100644
--- a/xen/common/vsprintf.c
+++ b/xen/common/vsprintf.c
@@ -153,11 +153,11 @@ static char *number(
     static const char large_digits[] = "0123456789ABCDEFGHIJKLMNOPQRSTUVWXYZ";
     int i;
 
+    ASSERT(base >= 2 && base <= 36);
+
     digits = (type & LARGE) ? large_digits : small_digits;
     if (type & LEFT)
         type &= ~ZEROPAD;
-    if (base < 2 || base > 36)
-        return NULL;
     c = (type & ZEROPAD) ? '0' : ' ';
     sign = 0;
     if (type & SIGN) {