fiftyone-devicedetection-onpremise 4.5.0a30__tar.gz → 4.5.0a32__tar.gz

{fiftyone_devicedetection_onpremise-4.5.0a30 → fiftyone_devicedetection_onpremise-4.5.0a32}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: fiftyone_devicedetection_onpremise
-Version: 4.5.0a30
+Version: 4.5.0a32
 Summary: This project contains 51Degrees Device Detection OnPremise engine that can be used with the 51Degrees Pipeline API. The Pipeline is a generic web request intelligence and data processing solution with the ability to add a range of 51Degrees and/or custom plug ins (Engines)
 Author: 51Degrees Engineering
 Author-email: engineering@51degrees.com

{fiftyone_devicedetection_onpremise-4.5.0a30 → fiftyone_devicedetection_onpremise-4.5.0a32}/src/fiftyone_devicedetection_onpremise/cxx/src/common-cxx/EngineBase.hpp

@@ -130,14 +130,14 @@ namespace FiftyoneDegrees {
 			 * @param data pointer to the data in memory
 			 * @param length length of the data in memory
 			 */
-			virtual void refreshData(void *data, long length) const = 0;
+			virtual void refreshData(void *data, fiftyoneDegreesFileOffset length) const = 0;
 
 			/**
 			 * Refresh the data set from the memory location provided.
 			 * @param data pointer to the data in memory
 			 * @param length of the data in memory
 			 */
-			virtual void refreshData(unsigned char data[], long length) const = 0;
+			virtual void refreshData(unsigned char data[], fiftyoneDegreesFileOffset length) const = 0;
 
 			/**
 			 * @}

{fiftyone_devicedetection_onpremise-4.5.0a30 → fiftyone_devicedetection_onpremise-4.5.0a32}/src/fiftyone_devicedetection_onpremise/cxx/src/common-cxx/dataset.c

@@ -50,7 +50,7 @@ static StatusCode replace(
 
 static StatusCode initWithTempFile(
 	DataSetBase *dataSet,
-	long bytesToCompare) {
+	FileOffset bytesToCompare) {
 	if (CONFIG(dataSet)->reuseTempFile == false ||
 		FileGetExistingTempFile(
 			dataSet->masterFileName,
@@ -192,7 +192,7 @@ fiftyoneDegreesStatusCode fiftyoneDegreesDataSetInitHeaders(
 fiftyoneDegreesStatusCode fiftyoneDegreesDataSetInitFromFile(
 	fiftyoneDegreesDataSetBase *dataSet,
 	const char *fileName,
-	long bytesToCompare) {
+	FileOffset bytesToCompare) {
 	char *copiedString;
 	// Add 1 for the null terminator
 	size_t fileNameLength = strlen(fileName) + 1;
@@ -270,7 +270,7 @@ void fiftyoneDegreesDataSetRelease(fiftyoneDegreesDataSetBase *dataSet) {
 fiftyoneDegreesStatusCode fiftyoneDegreesDataSetReloadManagerFromMemory(
 	fiftyoneDegreesResourceManager *manager,
 	void *source,
-	long length,
+	FileOffset length,
 	size_t dataSetSize,
 	fiftyoneDegreesDataSetInitFromMemoryMethod initDataSet,
 	fiftyoneDegreesException *exception) {

{fiftyone_devicedetection_onpremise-4.5.0a30 → fiftyone_devicedetection_onpremise-4.5.0a32}/src/fiftyone_devicedetection_onpremise/cxx/src/common-cxx/dataset.h

@@ -155,7 +155,7 @@ typedef fiftyoneDegreesStatusCode(*fiftyoneDegreesDataSetInitFromMemoryMethod)(
 	const void *config,
 	fiftyoneDegreesPropertiesRequired *properties,
 	void *memory,
-	long size,
+	fiftyoneDegreesFileOffset size,
 	fiftyoneDegreesException *exception);
 
 /**
@@ -241,7 +241,7 @@ fiftyoneDegreesStatusCode fiftyoneDegreesDataSetInitHeaders(
 fiftyoneDegreesStatusCode fiftyoneDegreesDataSetInitFromFile(
 	fiftyoneDegreesDataSetBase *dataSet,
 	const char *fileName,
-	long bytesToCompare);
+	fiftyoneDegreesFileOffset bytesToCompare);
 
 /**
  * Initialses the data set from data stored in continuous memory.
@@ -310,7 +310,7 @@ void fiftyoneDegreesDataSetFree(fiftyoneDegreesDataSetBase *dataSet);
 fiftyoneDegreesStatusCode fiftyoneDegreesDataSetReloadManagerFromMemory(
 	fiftyoneDegreesResourceManager *manager,
 	void *source,
-	long length,
+	fiftyoneDegreesFileOffset length,
 	size_t dataSetSize,
 	fiftyoneDegreesDataSetInitFromMemoryMethod initDataSet,
 	fiftyoneDegreesException *exception);
@@ -371,7 +371,7 @@ fiftyoneDegreesStatusCode fiftyoneDegreesDataSetReloadManagerFromFile(
 fiftyoneDegreesStatusCode fiftyoneDegrees##t##ReloadManagerFromMemory( \
 fiftyoneDegreesResourceManager *manager, \
 void *source, \
-long length, \
+fiftyoneDegreesFileOffset length, \
 fiftyoneDegreesException *exception) { \
 	return fiftyoneDegreesDataSetReloadManagerFromMemory( \
 		manager, \

{fiftyone_devicedetection_onpremise-4.5.0a30 → fiftyone_devicedetection_onpremise-4.5.0a32}/src/fiftyone_devicedetection_onpremise/cxx/src/common-cxx/fiftyone.h

@@ -470,6 +470,7 @@ MAP_TYPE(WkbtotResult)
 #define INSUFFICIENT_CAPACITY FIFTYONE_DEGREES_STATUS_INSUFFICIENT_CAPACITY /**< Synonym for #FIFTYONE_DEGREES_STATUS_INSUFFICIENT_CAPACITY status code. */
 #define INVALID_INPUT FIFTYONE_DEGREES_STATUS_INVALID_INPUT /**< Synonym for #FIFTYONE_DEGREES_STATUS_INVALID_INPUT status code.*/
 #define UNSUPPORTED_STORED_VALUE_TYPE FIFTYONE_DEGREES_STATUS_UNSUPPORTED_STORED_VALUE_TYPE /**< Synonym for #FIFTYONE_DEGREES_STATUS_UNSUPPORTED_STORED_VALUE_TYPE status code.*/
+#define FILE_TOO_LARGE FIFTYONE_DEGREES_STATUS_FILE_TOO_LARGE /**< Synonym for #FIFTYONE_DEGREES_STATUS_FILE_TOO_LARGE status code.*/
 #define IPV6_LENGTH FIFTYONE_DEGREES_IPV6_LENGTH /**< Synonym for #FIFTYONE_DEGREES_IPV6_LENGTH status code.*/
 #define IPV4_LENGTH FIFTYONE_DEGREES_IPV4_LENGTH /**< Synonym for #FIFTYONE_DEGREES_IPV4_LENGTH status code.*/
 #define IP_TYPE_IPV4 FIFTYONE_DEGREES_IP_TYPE_IPV4 /**< Synonym for #FIFTYONE_DEGREES_IP_TYPE_IPV4 status code.*/

{fiftyone_devicedetection_onpremise-4.5.0a30 → fiftyone_devicedetection_onpremise-4.5.0a32}/src/fiftyone_devicedetection_onpremise/cxx/src/common-cxx/file.c

@@ -50,7 +50,7 @@ typedef struct fileIteratorState_t {
 							the path and extension) */
 	size_t baseNameLength; /* Length of baseName */
 	const char *destination; /* Memory to write the matching file path to */
-	long bytesToCompare; /* Number of bytes to compare from the start of the
+	FileOffset bytesToCompare; /* Number of bytes to compare from the start of the
 						 file */
 } fileIteratorState;
 
@@ -113,7 +113,7 @@ FileOffset fiftyoneDegreesFileTell(FILE * const stream) {
 
 
 static FileOffset fileGetSize(FILE *file) {
-	if (fseek(file, 0L, SEEK_END) == 0) {
+	if (FileSeek(file, 0L, SEEK_END) == 0) {
 		return FileTell(file);
 	}
 	return -1;
@@ -183,8 +183,8 @@ static StatusCode fileOpen(
 static StatusCode fileCopy(FILE *source, FILE *destination) {
 	unsigned char buffer[8192];
 	size_t lengthRead, lengthWritten = 0;
-	if (fseek(source, 0L, SEEK_END) == 0) {
-		fseek(source, 0L, SEEK_SET);
+	if (FileSeek(source, 0L, SEEK_END) == 0) {
+		FileSeek(source, 0L, SEEK_SET);
 		lengthRead = fread(buffer, 1, sizeof(buffer), source);
 		while (lengthRead > 0) {
 			lengthWritten = fwrite(buffer, 1, lengthRead, destination);
@@ -291,10 +291,10 @@ static int getUniqueLegacyFileName(
 static bool compareFiles(
 	const char *fileName,
 	const char *otherFileName,
-	long bytesToCompare) {
+	FileOffset bytesToCompare) {
 	StatusCode status;
 	FILE *file, *otherFile;
-	FileOffset size, read;
+	FileOffset size;
 	byte buffer[1024], otherBuffer[1024];
 
 	// Compare the sizes.
@@ -315,9 +315,14 @@ static bool compareFiles(
 
 	while (FileTell(file) < size &&
 		(bytesToCompare < 0 || FileTell(file) < bytesToCompare)) {
-		read = bytesToCompare > 0 ? bytesToCompare : (long)sizeof(buffer);
-		if (size - FileTell(file) < read) {
-			read = size - FileTell(file);
+		size_t read = (
+			((bytesToCompare > 0)
+				&& (bytesToCompare <= (FileOffset)sizeof(buffer)))
+			? (size_t)bytesToCompare
+			: sizeof(buffer));
+
+		if ((uint64_t)(size - FileTell(file)) < (uint64_t)read) {
+			read = (size_t)(size - FileTell(file));
 		}
 
 		if (fread(buffer, read, 1, file) != 1) {
@@ -680,7 +685,7 @@ int fiftyoneDegreesFileDeleteUnusedTempFiles(
 	const char *masterFileName,
 	const char **paths,
 	int count,
-	long bytesToCompare) {
+	FileOffset bytesToCompare) {
 	int i;
 	byte deleted = 0;
 	fileIteratorState state;
@@ -722,7 +727,7 @@ bool fiftyoneDegreesFileGetExistingTempFile(
 	const char *masterFileName,
 	const char **paths,
 	int count,
-	long bytesToCompare,
+	FileOffset bytesToCompare,
 	const char *destination) {
 	int i;
 	fileIteratorState state;
@@ -1094,32 +1099,38 @@ fiftyoneDegreesStatusCode fiftyoneDegreesFileReadToByteArray(
 	if (status == SUCCESS) {
 		// Get the size of the file and allocate sufficient memory.
 		reader->length = fileGetSize(sourceFile);
-		reader->current = reader->startByte = (byte*)Malloc(
-			sizeof(char) * reader->length);
-		if (reader->current != NULL) {
-			if (fseek(sourceFile, 0L, SEEK_SET) != 0 ||
-				fread(reader->current, reader->length, 1, sourceFile) != 1) {
-				// The file could not be loaded into memory. Release the 
-				// memory allocated earlier and set the status to file 
-				// failure.
-				free(reader->current);
-				reader->startByte = NULL;
-				reader->current = NULL;
-				reader->length = 0;
-				status = FILE_FAILURE;
+		if (reader->length < 0) {
+			status = FILE_FAILURE;
+		} else if ((uint64_t)reader->length > (uint64_t)SIZE_MAX) {
+			status = FILE_TOO_LARGE;
+		} else {
+			size_t const fileSize = (size_t)(reader->length * sizeof(char));
+			reader->current = reader->startByte = (byte*)Malloc(fileSize);
+			if (reader->current != NULL) {
+				if (FileSeek(sourceFile, 0L, SEEK_SET) != 0 ||
+					fread(reader->current, fileSize, 1, sourceFile) != 1) {
+					// The file could not be loaded into memory. Release the
+					// memory allocated earlier and set the status to file
+					// failure.
+					free(reader->current);
+					reader->startByte = NULL;
+					reader->current = NULL;
+					reader->length = 0;
+					status = FILE_FAILURE;
+				}
+				else {
+					// Set the last byte to validate that the entire data structure
+					// has been read.
+					reader->lastByte = reader->current + reader->length;
+				}
 			}
 			else {
-				// Set the last byte to validate that the entire data structure
-				// has been read.
-				reader->lastByte = reader->current + reader->length;
+				// Sufficient memory could not be allocated.
+				reader->current = NULL;
+				reader->length = 0;
+				status = INSUFFICIENT_MEMORY;
 			}
 		}
-		else {
-			// Sufficient memory could not be allocated.
-			reader->current = NULL;
-			reader->length = 0;
-			status = INSUFFICIENT_MEMORY;
-		}
 		fclose(sourceFile);
 	}
 	return status;

{fiftyone_devicedetection_onpremise-4.5.0a30 → fiftyone_devicedetection_onpremise-4.5.0a32}/src/fiftyone_devicedetection_onpremise/cxx/src/common-cxx/file.h

@@ -354,7 +354,7 @@ EXTERNAL bool fiftyoneDegreesFileGetExistingTempFile(
 	const char *masterFile,
 	const char **paths,
 	int count,
-	long bytesToCompare,
+	fiftyoneDegreesFileOffset bytesToCompare,
 	const char *destination);
 
 /**
@@ -378,7 +378,7 @@ EXTERNAL int fiftyoneDegreesFileDeleteUnusedTempFiles(
 	const char *masterFileName,
 	const char **paths,
 	int count,
-	long bytesToCompare);
+	fiftyoneDegreesFileOffset bytesToCompare);
 
 /**
  * Create a temporary file name and add it to the destination.

{fiftyone_devicedetection_onpremise-4.5.0a30 → fiftyone_devicedetection_onpremise-4.5.0a32}/src/fiftyone_devicedetection_onpremise/cxx/src/common-cxx/status.h

@@ -144,6 +144,7 @@ typedef enum e_fiftyone_degrees_status_code {
 										   misformat or semantic inconsistency) */
 	FIFTYONE_DEGREES_STATUS_UNSUPPORTED_STORED_VALUE_TYPE, /**< StoredValueType
 											is not supported at this version. */
+	FIFTYONE_DEGREES_STATUS_FILE_TOO_LARGE, /**< File size exceeds malloc capabilities */
 } fiftyoneDegreesStatusCode;
 
 /**

{fiftyone_devicedetection_onpremise-4.5.0a30 → fiftyone_devicedetection_onpremise-4.5.0a32}/src/fiftyone_devicedetection_onpremise.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: fiftyone-devicedetection-onpremise
-Version: 4.5.0a30
+Version: 4.5.0a32
 Summary: This project contains 51Degrees Device Detection OnPremise engine that can be used with the 51Degrees Pipeline API. The Pipeline is a generic web request intelligence and data processing solution with the ability to add a range of 51Degrees and/or custom plug ins (Engines)
 Author: 51Degrees Engineering
 Author-email: engineering@51degrees.com

fiftyone_devicedetection_onpremise-4.5.0a32/version.txt

@@ -0,0 +1 @@
+4.5.0-alpha.32

fiftyone_devicedetection_onpremise-4.5.0a30/version.txt

@@ -1 +0,0 @@
-4.5.0-alpha.30