MonetDB: Dec2023 - Check for errors.

[Sjoerd Mullender via checkin-list]

Changeset: 5c554cfbff39 for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB/rev/5c554cfbff39
Modified Files:
        sql/server/sql_scan.c
Branch: Dec2023
Log Message:

Check for errors.
This fixes bug #7461.


diffs (37 lines):

diff --git a/sql/server/sql_scan.c b/sql/server/sql_scan.c
--- a/sql/server/sql_scan.c
+++ b/sql/server/sql_scan.c
@@ -1495,9 +1495,12 @@ sql_get_next_token(YYSTYPE *yylval, void
                case 'e':
                case 'E':
                        assert(yylval->sval[1] == '\'');
-                       GDKstrFromStr((unsigned char *) str,
-                                                 (unsigned char *) 
yylval->sval + 2,
-                                                 lc->yycur-lc->yysval - 2, 
'\'');
+                       if (GDKstrFromStr((unsigned char *) str,
+                                                         (unsigned char *) 
yylval->sval + 2,
+                                                         lc->yycur-lc->yysval 
- 2, '\'') < 0) {
+                               sql_error(c, 1, SQLSTATE(42000) "%s", 
GDKerrbuf);
+                               return LEX_ERROR;
+                       }
                        quote = '\'';
                        break;
                case 'u':
@@ -1539,10 +1542,13 @@ sql_get_next_token(YYSTYPE *yylval, void
                                                src++;
                                *dst = 0;
                        } else {
-                               GDKstrFromStr((unsigned char *)str,
-                                                         (unsigned char 
*)yylval->sval + 1,
-                                                         lc->yycur - 
lc->yysval - 1,
-                                                         '\'');
+                               if (GDKstrFromStr((unsigned char *)str,
+                                                                 (unsigned 
char *)yylval->sval + 1,
+                                                                 lc->yycur - 
lc->yysval - 1,
+                                                                 '\'') < 0) {
+                                       sql_error(c, 1, SQLSTATE(42000) "%s", 
GDKerrbuf);
+                                       return LEX_ERROR;
+                               }
                        }
                        break;
                }
_______________________________________________
checkin-list mailing list -- checkin-list@monetdb.org
To unsubscribe send an email to checkin-list-le...@monetdb.org