kenmirrors/asterisk
1
0
Fork 0
mirror of https://github.com/asterisk/asterisk.git synced 2025-09-03 11:25:35 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix sscanf() format string type mismatch.

Browse Source 
ASTERISK-25615
Reported by: George Joseph

Change-Id: Ieff35307254ca193f3d473cff2e396ca57c7ce0b
This commit is contained in:
Richard Mudgett
2015-12-14 15:25:02 -06:00
parent b47b632107
commit eccdf2250b
2 changed files with 23 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
include/asterisk/utils.h
View File

@@ -1105,9 +1105,10 @@ int ast_file_is_readable(const char *filename);
*
* \param version1.
* \param version2.
* \return -1 if version 1 < version 2.
* \return 0 if version 1 = version 2.
* \return 1 if version 1 > version 2.
*
* \return <0 if version 1 < version 2.
* \return =0 if version 1 = version 2.
* \return >0 if version 1 > version 2.
*/
int ast_compare_versions(const char *version1, const char *version2);

35
main/utils.c
View File

@@ -2953,23 +2953,26 @@ int ast_file_is_readable(const char *filename)
int ast_compare_versions(const char *version1, const char *version2)
{
u_int64_t major[2] = { 0 };
u_int64_t minor[2] = { 0 };
u_int64_t patch[2] = { 0 };
u_int64_t extra[2] = { 0 };
u_int64_t v1, v2;
unsigned int major[2] = { 0 };
unsigned int minor[2] = { 0 };
unsigned int patch[2] = { 0 };
unsigned int extra[2] = { 0 };
int res;
sscanf(version1, "%lu.%lu.%lu.%lu", &major[0], &minor[0], &patch[0], &extra[0]);
sscanf(version2, "%lu.%lu.%lu.%lu", &major[1], &minor[1], &patch[1], &extra[1]);
sscanf(version1, "%u.%u.%u.%u", &major[0], &minor[0], &patch[0], &extra[0]);
sscanf(version2, "%u.%u.%u.%u", &major[1], &minor[1], &patch[1], &extra[1]);
v1 = major[0] << 48 | minor[0] << 32 | patch[0] << 16 | extra[0];
v2 = major[1] << 48 | minor[1] << 32 | patch[1] << 16 | extra[1];
if (v1 < v2) {
return -1;
} else if (v1 > v2) {
return 1;
} else {
return 0;
res = major[0] - major[1];
if (res) {
return res;
}
res = minor[0] - minor[1];
if (res) {
return res;
}
res = patch[0] - patch[1];
if (res) {
return res;
}
return extra[0] - extra[1];
}