Merged Pull Request '#61 update-packages/main->main: Update packages'

Co-authored-by: Automation51D <[email protected]>

Author: Automation51D

dd/device-detection-cxx.c

@@ -3592,7 +3592,7 @@ EXTERNAL int fiftyoneDegreesFloatIsEqual(fiftyoneDegreesFloatInternal f1, fiftyo
  * the IEEE single precision standard is supported, default the type
  * to the native float type.
  */
-#if _MSC_VER || (FLT_RADIX == 2 && FLT_MANT_DIG == 24 && FLT_MAX_EXP == 128 && FLT_MIN_EXP == -125)
+#if defined(_MSC_VER) || (defined(FLT_RADIX) && FLT_RADIX == 2 && FLT_MANT_DIG == 24 && FLT_MAX_EXP == 128 && FLT_MIN_EXP == -125)
 /**
  * Define 51Degrees float implementation as native float.
  */
@@ -11692,7 +11692,7 @@ size_t fiftyoneDegreesHeadersSize(int count) {
 
 typedef void(*parseIterator)(
 	void *state,
-	EvidenceIpType type,
+	EvidenceIpType segmentType,
 	const char *start,
 	const char *end);
 
@@ -11701,13 +11701,13 @@ typedef void(*parseIterator)(
  */
 static void callbackIpAddressCount(
 	void *state,
-	EvidenceIpType type,
+	EvidenceIpType segmentType,
 	const char *start,
 	const char *end) {
 	if (start <= end) {
-		if (type != FIFTYONE_DEGREES_EVIDENCE_IP_TYPE_INVALID) {
+		if (segmentType != FIFTYONE_DEGREES_EVIDENCE_IP_TYPE_INVALID) {
 			(*(int*)state)++;
-			if (type == FIFTYONE_DEGREES_EVIDENCE_IP_TYPE_IPV6) {
+			if (segmentType == FIFTYONE_DEGREES_EVIDENCE_IP_TYPE_IPV6) {
 				(*(int*)state)++;
 			}
 		}
@@ -11765,27 +11765,48 @@ static void parseIpV6Segment(
 
 static void callbackIpAddressBuild(
 	void *state,
-	EvidenceIpType type,
+	EvidenceIpType segmentType,
 	const char *start,
 	const char *end) {
 	EvidenceIpAddress *address = (EvidenceIpAddress*)state;
-	if (type == FIFTYONE_DEGREES_EVIDENCE_IP_TYPE_IPV4) {
+	if (segmentType == FIFTYONE_DEGREES_EVIDENCE_IP_TYPE_IPV4) {
 		*address->current = getIpByte(atoi(start));
 		address->current++;
 	}
-	else if (type == FIFTYONE_DEGREES_EVIDENCE_IP_TYPE_IPV6) {
+	else if (segmentType == FIFTYONE_DEGREES_EVIDENCE_IP_TYPE_IPV6) {
 		parseIpV6Segment(address, start, end);
 	}
 }
 
-static EvidenceIpType getIpTypeFromSeparator(char separator) {
+static EvidenceIpType getIpTypeFromSeparator(const char separator) {
 	switch (separator) {
-	case '.':
-		return FIFTYONE_DEGREES_EVIDENCE_IP_TYPE_IPV4;
-	case ':':
-		return FIFTYONE_DEGREES_EVIDENCE_IP_TYPE_IPV6;
-	default:
-		return FIFTYONE_DEGREES_EVIDENCE_IP_TYPE_INVALID;
+		case '.':
+			return FIFTYONE_DEGREES_EVIDENCE_IP_TYPE_IPV4;
+		case ':':
+			return FIFTYONE_DEGREES_EVIDENCE_IP_TYPE_IPV6;
+		default:
+			return FIFTYONE_DEGREES_EVIDENCE_IP_TYPE_INVALID;
+	}
+}
+
+static EvidenceIpType getSegmentTypeWithSeparator(
+	const char separator,
+	const EvidenceIpType ipType,
+	const EvidenceIpType lastSeparatorType) {
+	switch (ipType) {
+		case FIFTYONE_DEGREES_EVIDENCE_IP_TYPE_IPV4:
+			return FIFTYONE_DEGREES_EVIDENCE_IP_TYPE_IPV4;
+		case FIFTYONE_DEGREES_EVIDENCE_IP_TYPE_IPV6:
+			switch (separator) {
+				case ':':
+					return FIFTYONE_DEGREES_EVIDENCE_IP_TYPE_IPV6;
+				case '.':
+					return FIFTYONE_DEGREES_EVIDENCE_IP_TYPE_IPV4;
+				default:
+					return lastSeparatorType;
+			}
+		default:
+			return getIpTypeFromSeparator(separator);
 	}
 }
 
@@ -11801,18 +11822,20 @@ static EvidenceIpType iterateIpAddress(
 	parseIterator foundSegment) {
 	const char *current = start;
 	const char *nextSegment = current;
+	EvidenceIpType currentSegmentType = FIFTYONE_DEGREES_EVIDENCE_IP_TYPE_INVALID;
 	while (current <= end && nextSegment < end) {
 		if (*current == ',' ||
 			*current == ':' ||
 			*current == '.' ||
 			*current == ' ' ||
 			*current == '\0') {
+			currentSegmentType = getSegmentTypeWithSeparator(*current, type, currentSegmentType);
 			if (type == FIFTYONE_DEGREES_EVIDENCE_IP_TYPE_INVALID) {
-				type = getIpTypeFromSeparator(*current);
+				type = currentSegmentType;
 			}
 			// Check if it is leading abbreviation
 			if (current - 1 >= start) {
-				foundSegment(state, type, nextSegment, current - 1);
+				foundSegment(state, currentSegmentType, nextSegment, current - 1);
 			}
 			nextSegment = current + 1;
 		}
@@ -15061,7 +15084,7 @@ void fiftyoneDegreesTextFileIterateWithLimit(
 
 			// Shift the buffer to the left and load the next characters.
 			size_t shift = end - current;
-			memcpy(buffer, current, shift);
+			memmove(buffer, current, shift);
 			current = buffer + shift;
 		}
 		// Update end to the last line read
@@ -15242,7 +15265,7 @@ void fiftyoneDegreesSignalWait(fiftyoneDegreesSignal *signal) {
 #endif
 
 bool fiftyoneDegreesThreadingGetIsThreadSafe() {
-#if FIFTYONE_DEGREES_NO_THREADING
+#if defined(FIFTYONE_DEGREES_NO_THREADING) && FIFTYONE_DEGREES_NO_THREADING
 	return false;
 #else
 	return true;

dd/device-detection-cxx.h

@@ -3643,7 +3643,7 @@ EXTERNAL int fiftyoneDegreesFloatIsEqual(fiftyoneDegreesFloatInternal f1, fiftyo
  * the IEEE single precision standard is supported, default the type
  * to the native float type.
  */
-#if _MSC_VER || (FLT_RADIX == 2 && FLT_MANT_DIG == 24 && FLT_MAX_EXP == 128 && FLT_MIN_EXP == -125)
+#if defined(_MSC_VER) || (defined(FLT_RADIX) && FLT_RADIX == 2 && FLT_MANT_DIG == 24 && FLT_MAX_EXP == 128 && FLT_MIN_EXP == -125)
 /**
  * Define 51Degrees float implementation as native float.
  */