diff options
| author | Olivier Bertrand <bertrandop@gmail.com> | 2017-06-11 17:22:56 +0200 |
|---|---|---|
| committer | Olivier Bertrand <bertrandop@gmail.com> | 2017-06-11 17:22:56 +0200 |
| commit | c51548d6b4234d1b9bf7548125f63c5975f37d35 (patch) | |
| tree | 5aaa9514d62dcaca3a5580dcc8edd6dbdcad1748 /storage/connect/jdbconn.cpp | |
| parent | f3452fcd844d6477968c3feb982e30612aa34f4d (diff) | |
| download | mariadb-git-c51548d6b4234d1b9bf7548125f63c5975f37d35.tar.gz | |
Fix unhandled exception:
Force type int for ENUMs.
Replace remaining longjmp.
modified: storage/connect/array.cpp
modified: storage/connect/colblk.cpp
modified: storage/connect/connect.cc
modified: storage/connect/filter.cpp
modified: storage/connect/jdbconn.cpp
modified: storage/connect/plgdbutl.cpp
modified: storage/connect/tabdos.cpp
modified: storage/connect/tabvir.cpp
modified: storage/connect/tabxml.cpp
modified: storage/connect/value.cpp
modified: storage/connect/xobject.cpp
Diffstat (limited to 'storage/connect/jdbconn.cpp')
| -rw-r--r-- | storage/connect/jdbconn.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/storage/connect/jdbconn.cpp b/storage/connect/jdbconn.cpp index f077cd2182b..22e89a41efb 100644 --- a/storage/connect/jdbconn.cpp +++ b/storage/connect/jdbconn.cpp @@ -1215,7 +1215,7 @@ void JDBConn::SetColumnValue(int rank, PSZ name, PVAL val) if (rank == 0) if (!name || (jn = env->NewStringUTF(name)) == nullptr) { sprintf(g->Message, "Fail to allocate jstring %s", SVP(name)); - throw TYPE_AM_JDBC; + throw (int)TYPE_AM_JDBC; } // endif name // Returns 666 is case of error @@ -1223,7 +1223,7 @@ void JDBConn::SetColumnValue(int rank, PSZ name, PVAL val) if (Check((ctyp == 666) ? -1 : 1)) { sprintf(g->Message, "Getting ctyp: %s", Msg); - throw TYPE_AM_JDBC; + throw (int)TYPE_AM_JDBC; } // endif Check if (val->GetNullable()) @@ -1334,7 +1334,7 @@ void JDBConn::SetColumnValue(int rank, PSZ name, PVAL val) env->DeleteLocalRef(jn); sprintf(g->Message, "SetColumnValue: %s rank=%d ctyp=%d", Msg, rank, (int)ctyp); - throw TYPE_AM_JDBC; + throw (int)TYPE_AM_JDBC; } // endif Check if (rank == 0) |