firebird/firebird-mirror
firebird/firebird-mirror
8
0
Fork 1
mirror of https://github.com/FirebirdSQL/firebird.git synced 2025-01-24 07:23:03 +01:00
Code Issues

Correct some logic errors found by Claudio

Browse Source
This commit is contained in:
asfernandes 2008-02-29 15:21:37 +00:00
parent 631e894d4f
commit 02bc92474f
1 changed files with 4 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/jrd/cvt.cpp
View File

@ -1907,7 +1907,7 @@ static SSHORT decompose(const char* string,
while (q < end && *q && *q != ' ') while (q < end && *q && *q != ' ')
++q; ++q;
end = q; const char* digits_end = q;
// skip trailing spaces // skip trailing spaces
while (q < end && *q == ' ') while (q < end && *q == ' ')
@ -1917,13 +1917,13 @@ static SSHORT decompose(const char* string,
conversion_error(&errd, err); conversion_error(&errd, err);
q = p; q = p;
value = hex_to_value(q, end); value = hex_to_value(q, digits_end);
if (q != end) if (q != digits_end)
conversion_error(&errd, err); conversion_error(&errd, err);
// 0xFFFFFFFF = -1; 0x0FFFFFFFF = 4294967295 // 0xFFFFFFFF = -1; 0x0FFFFFFFF = 4294967295
if (end - p <= 8) if (digits_end - p <= 8)
value = (SLONG) value; value = (SLONG) value;
if (dtype == dtype_long) if (dtype == dtype_long)
@ -2805,10 +2805,6 @@ SINT64 hex_to_value(const char*& string, const char* end)
* converts a hex string into a numeric value, and the * converts a hex string into a numeric value, and the
* biggest hex string supported must fit into a BIGINT. * biggest hex string supported must fit into a BIGINT.
* *
* We assume that the caller has pre-processed the
* input string, so that all characters here are upper case
* and the length of the string is <= 16.
*
*************************************/ *************************************/
{ {
// we already know this is a hex string, and there is no prefix. // we already know this is a hex string, and there is no prefix.