From ce38df527f50ee0d85c80b9ace5989c4496648ec Mon Sep 17 00:00:00 2001
From: Pascal Quantin <pascal.quantin@gmail.com>
Date: Sun, 23 Aug 2015 21:02:24 +0200
Subject: [PATCH] CBOR: get rid of INFINITY and NAN defines

This triggers an "overflow in constant arithmetic" warning with MSVC2013

Change-Id: Ie3b076019c4722857c8e57f8568a0cb124fd13ad
Reviewed-on: https://code.wireshark.org/review/10217
Petri-Dish: Pascal Quantin <pascal.quantin@gmail.com>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
---
 epan/dissectors/packet-cbor.c | 34 +++++++++++++++++++---------------
 1 file changed, 19 insertions(+), 15 deletions(-)

diff --git a/epan/dissectors/packet-cbor.c b/epan/dissectors/packet-cbor.c
index 89de18a726..4b83f9e4e1 100644
--- a/epan/dissectors/packet-cbor.c
+++ b/epan/dissectors/packet-cbor.c
@@ -562,29 +562,35 @@ dissect_cbor_tag(tvbuff_t *tvb, packet_info *pinfo, proto_tree *cbor_tree, gint
 }
 
 /* based on code from rfc7049 appendix-D */
-static float decode_half(const int half) {
-	int exponent = (half >> 10) & 0x1f;
-	int mantissa = half & 0x3ff;
+static proto_item *decode_half(tvbuff_t *tvb, proto_tree *tree, gint *offset, int hfindex) {
+	int half, exponent, mantissa;
 	float val;
+	proto_item *item;
 
-	if (exponent == 0)
+	half = tvb_get_ntohs(tvb, *offset);
+	exponent = (half >> 10) & 0x1f;
+	mantissa = half & 0x3ff;
+
+	if (exponent == 0) {
 		val = ldexpf((float)mantissa, -24);
-	else if (exponent != 31)
+		item = proto_tree_add_float(tree, hfindex, tvb, *offset, 2,
+						half & 0x8000 ? -val : val);
+	} else if (exponent != 31) {
 		val = ldexpf((float)(mantissa + 1024), exponent - 25);
-	else {
-		if (mantissa == 0)
-			val = INFINITY;
-		else
-			val = NAN;
+		item = proto_tree_add_float(tree, hfindex, tvb, *offset, 2,
+						half & 0x8000 ? -val : val);
+	} else {
+		item = proto_tree_add_float_format_value(tree, hfindex, tvb, *offset, 2,
+						0, "%s", mantissa == 0 ? "INFINITY" : "NAN");
 	}
-	return half & 0x8000 ? -val : val;
+	*offset += 2;
+	return item;
 }
 
 static proto_item *
 dissect_cbor_float_simple_data(tvbuff_t *tvb, packet_info *pinfo, proto_tree *cbor_tree, gint *offset, guint8 type_minor)
 {
 	proto_item      *item;
-	int		half;
 
 	switch (type_minor) {
 	case 0x18:
@@ -594,9 +600,7 @@ dissect_cbor_float_simple_data(tvbuff_t *tvb, packet_info *pinfo, proto_tree *cb
 		return item;
 	case 0x19:
 		*offset += 1;
-		half = tvb_get_ntohs(tvb, *offset);
-		item = proto_tree_add_float(cbor_tree, hf_cbor_type_float16, tvb, *offset, 2, decode_half(half));
-		*offset += 2;
+		item = decode_half(tvb, cbor_tree, offset, hf_cbor_type_float16);
 		return item;
 	case 0x1a:
 		*offset += 1;