diff options
Diffstat (limited to 'storage/connect/javaconn.cpp')
| -rw-r--r-- | storage/connect/javaconn.cpp | 24 |
1 files changed, 12 insertions, 12 deletions
diff --git a/storage/connect/javaconn.cpp b/storage/connect/javaconn.cpp index 364d49f8e7c..0dc467aa7ee 100644 --- a/storage/connect/javaconn.cpp +++ b/storage/connect/javaconn.cpp @@ -272,25 +272,25 @@ bool JAVAConn::GetJVM(PGLOBAL g) char buf[256]; DWORD rc = GetLastError(); - sprintf(g->Message, MSG(DLL_LOAD_ERROR), rc, soname); + snprintf(g->Message, sizeof(g->Message), MSG(DLL_LOAD_ERROR), rc, soname); FormatMessage(FORMAT_MESSAGE_FROM_SYSTEM | FORMAT_MESSAGE_IGNORE_INSERTS, NULL, rc, 0, (LPTSTR)buf, sizeof(buf), NULL); strcat(strcat(g->Message, ": "), buf); } else if (!(CreateJavaVM = (CRTJVM)GetProcAddress((HINSTANCE)LibJvm, "JNI_CreateJavaVM"))) { - sprintf(g->Message, MSG(PROCADD_ERROR), GetLastError(), "JNI_CreateJavaVM"); + snprintf(g->Message, sizeof(g->Message), MSG(PROCADD_ERROR), GetLastError(), "JNI_CreateJavaVM"); FreeLibrary((HMODULE)LibJvm); LibJvm = NULL; } else if (!(GetCreatedJavaVMs = (GETJVM)GetProcAddress((HINSTANCE)LibJvm, "JNI_GetCreatedJavaVMs"))) { - sprintf(g->Message, MSG(PROCADD_ERROR), GetLastError(), "JNI_GetCreatedJavaVMs"); + snprintf(g->Message, sizeof(g->Message), MSG(PROCADD_ERROR), GetLastError(), "JNI_GetCreatedJavaVMs"); FreeLibrary((HMODULE)LibJvm); LibJvm = NULL; #if defined(_DEBUG) } else if (!(GetDefaultJavaVMInitArgs = (GETDEF)GetProcAddress((HINSTANCE)LibJvm, "JNI_GetDefaultJavaVMInitArgs"))) { - sprintf(g->Message, MSG(PROCADD_ERROR), GetLastError(), + snprintf(g->Message, sizeof(g->Message), MSG(PROCADD_ERROR), GetLastError(), "JNI_GetDefaultJavaVMInitArgs"); FreeLibrary((HMODULE)LibJvm); LibJvm = NULL; @@ -317,22 +317,22 @@ bool JAVAConn::GetJVM(PGLOBAL g) // Load the desired shared library if (!LibJvm) { error = dlerror(); - sprintf(g->Message, MSG(SHARED_LIB_ERR), soname, SVP(error)); + snprintf(g->Message, sizeof(g->Message), MSG(SHARED_LIB_ERR), soname, SVP(error)); } else if (!(CreateJavaVM = (CRTJVM)dlsym(LibJvm, "JNI_CreateJavaVM"))) { error = dlerror(); - sprintf(g->Message, MSG(GET_FUNC_ERR), "JNI_CreateJavaVM", SVP(error)); + snprintf(g->Message, sizeof(g->Message), MSG(GET_FUNC_ERR), "JNI_CreateJavaVM", SVP(error)); dlclose(LibJvm); LibJvm = NULL; } else if (!(GetCreatedJavaVMs = (GETJVM)dlsym(LibJvm, "JNI_GetCreatedJavaVMs"))) { error = dlerror(); - sprintf(g->Message, MSG(GET_FUNC_ERR), "JNI_GetCreatedJavaVMs", SVP(error)); + snprintf(g->Message, sizeof(g->Message), MSG(GET_FUNC_ERR), "JNI_GetCreatedJavaVMs", SVP(error)); dlclose(LibJvm); LibJvm = NULL; #if defined(_DEBUG) } else if (!(GetDefaultJavaVMInitArgs = (GETDEF)dlsym(LibJvm, "JNI_GetDefaultJavaVMInitArgs"))) { error = dlerror(); - sprintf(g->Message, MSG(GET_FUNC_ERR), "JNI_GetDefaultJavaVMInitArgs", SVP(error)); + snprintf(g->Message, sizeof(g->Message), MSG(GET_FUNC_ERR), "JNI_GetDefaultJavaVMInitArgs", SVP(error)); dlclose(LibJvm); LibJvm = NULL; #endif // _DEBUG @@ -473,7 +473,7 @@ bool JAVAConn::Open(PGLOBAL g) strcpy(g->Message, "Invalid arguments"); break; default: - sprintf(g->Message, "Unknown return code %d", (int)rc); + snprintf(g->Message, sizeof(g->Message), "Unknown return code %d", (int)rc); break; } // endswitch rc @@ -492,7 +492,7 @@ bool JAVAConn::Open(PGLOBAL g) jdi = env->FindClass(m_Wrap); if (jdi == nullptr) { - sprintf(g->Message, "ERROR: class %s not found!", m_Wrap); + snprintf(g->Message, sizeof(g->Message), "ERROR: class %s not found!", m_Wrap); return true; } // endif jdi @@ -538,13 +538,13 @@ bool JAVAConn::Open(PGLOBAL g) jmethodID ctor = env->GetMethodID(jdi, "<init>", "(Z)V"); if (ctor == nullptr) { - sprintf(g->Message, "ERROR: %s constructor not found!", m_Wrap); + snprintf(g->Message, sizeof(g->Message), "ERROR: %s constructor not found!", m_Wrap); return true; } else job = env->NewObject(jdi, ctor, jt); if (job == nullptr) { - sprintf(g->Message, "%s class object not constructed!", m_Wrap); + snprintf(g->Message, sizeof(g->Message), "%s class object not constructed!", m_Wrap); return true; } // endif job |