[Firebird-checkins] CVS: interbase/jrd cvt.c,1.3,1.4

[Claudio V. C. <ro...@us...>]

Build Number:591

Update of /cvsroot/firebird/interbase/jrd
In directory usw-pr-cvs1:/tmp/cvs-serv22090

Modified Files:
	cvt.c 
Log Message:
Conversion error from <value> should show the "from" descriptor,
not the "to" descriptor in integer_to_tex() when an overflow occurs.


Index: cvt.c
===================================================================
RCS file: /cvsroot/firebird/interbase/jrd/cvt.c,v
retrieving revision 1.3
retrieving revision 1.4
diff -U3 -r1.3 -r1.4
--- cvt.c	2001/06/26 07:54:54	1.3
+++ cvt.c	2001/11/21 03:06:11	1.4
@@ -21,6 +21,8 @@
  * Contributor(s): ______________________________________.
  * 2001.6.16 Claudio Valderrama: Wiped out the leading space in
  * cast(float_expr as char(n)) in dialect 1, reported in SF.
+ * 2001.11.19 Claudio Valderrama: integer_to_text() should use the
+ * source descriptor "from" to call conversion_error.
  */
 
 #include "../jrd/ib_stdio.h"
@@ -2343,7 +2345,7 @@
 if ((to->dsc_dtype == dtype_text    && length > to->dsc_length) ||
     (to->dsc_dtype == dtype_cstring && length >= to->dsc_length) ||
     (to->dsc_dtype == dtype_varying && length > (SSHORT)(to->dsc_length - sizeof (USHORT))))
-    conversion_error (to, err);
+    conversion_error (from, err);
 
 q = (to->dsc_dtype == dtype_varying) ? to->dsc_address + sizeof (USHORT) : to->dsc_address;