Cronocide/Descent3
1
0
Fork 0
mirror of https://github.com/kevinbentley/Descent3.git synced 2025-01-22 11:28:56 +00:00
Code Issues Packages Projects Releases Wiki Activity

Registry: read hexadecimal values correctly

Browse Source 
Hex string values from the registry containing an alpha character were parsed incorrectly. Use more standard hex parsing instead of hand-made incorrect function
This commit is contained in:
Louis Gombert 2024-09-23 21:57:14 +02:00
parent 39e128cb0f
commit d307a0db6e
1 changed files with 8 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
linux/registry.cpp
View File

@ -1,5 +1,5 @@
/*
* Descent 3
* Descent 3
* Copyright (C) 2024 Parallax Software
*
* This program is free software: you can redistribute it and/or modify
@ -51,7 +51,7 @@
#include <cstdlib>
#include <cstring>
#include <cctype>
#include <sstream>
#include "log.h"
#include "registry.h"
@ -60,19 +60,11 @@
#endif
// Convert a string that represents a hex value into an int
int hextoi(char *p) {
int value = 0;
while ((p) && (*p) && isalnum(*p)) {
*p = toupper(*p);
if ((*p >= '0') && (*p <= '9'))
value = (value * 16) + ((*p) - '0');
else if ((*p >= 'A') && (*p <= 'F'))
value = (value * 16) + ((*p) - 'A');
else
return value;
p++;
}
int hextoi(char *hexstring) {
int value;
std::stringstream ss;
ss << std::hex << hexstring;
ss >> value;
return value;
}
@ -289,7 +281,6 @@ bool CRegistry::Import() {
}
// now we "SHOULD" know the type, parse the info
char data[300];
int idata;
switch (type) {
case REGT_STRING:
PARSE_STRING(newbuff);
@ -310,7 +301,7 @@ bool CRegistry::Import() {
PARSE_STRING(newbuff);
ptr += 7; // blow by =dword:
PARSE_TOKEN(data);
idata = hextoi(data);
int idata = hextoi(data);
if (!CreateRecord(newbuff, REGT_DWORD, &idata)) {
// mprintf(0,"Unable to create dword record: %s\n",newbuff);
} else {