Merge remote-tracking branch 'origin/ticket52' into stg-2.409

[stg.git] / projects / sgconf / common_sg.cpp

diff --git a/projects/sgconf/common_sg.cpp b/projects/sgconf/common_sg.cpp
index 9c1b7283705bdf3cbc1652811e847c463b55cab9..86214a3dd916c81b6333733f90f97f7dc1546215 100644 (file)
--- a/projects/sgconf/common_sg.cpp
+++ b/projects/sgconf/common_sg.cpp
@@ -213,13 +213,6 @@ return usr;
 void ConvertKOI8(const string & src, string * dst, int encType)
 {
 iconv_t cd;
 void ConvertKOI8(const string & src, string * dst, int encType)
 {
 iconv_t cd;

-char * ob = new char[src.size() * 2 + 1];
-char * ib = new char[src.size() + 1];
-
-strcpy(ib, src.c_str());
-
-char * outbuf = ob;
-char * inbuf = ib;

 
 setlocale(LC_ALL, "");
 
 
 setlocale(LC_ALL, "");
 


@@ -239,11 +232,6 @@ else
 
 size_t nconv = 1;
 
 
 size_t nconv = 1;
 

-size_t insize = strlen(ib);
-size_t outsize = insize * 2 + 1;
-
-insize = src.size();
-

 cd = iconv_open(charsetT, charsetF);
 if (cd == (iconv_t) -1)
     {
 cd = iconv_open(charsetT, charsetF);
 if (cd == (iconv_t) -1)
     {


@@ -259,6 +247,19 @@ if (cd == (iconv_t) -1)
     exit(ICONV_ERR_CODE);
     }
 
     exit(ICONV_ERR_CODE);
     }
 

+char * ob = new char[src.size() * 2 + 1];
+char * ib = new char[src.size() + 1];
+
+strcpy(ib, src.c_str());
+
+char * outbuf = ob;
+char * inbuf = ib;
+
+size_t insize = strlen(ib);
+size_t outsize = insize * 2 + 1;
+
+insize = src.size();
+

 #if defined(CONST_ICONV)
 nconv = iconv(cd, (const char **)&inbuf, &insize, &outbuf, &outsize);
 #else
 #if defined(CONST_ICONV)
 nconv = iconv(cd, (const char **)&inbuf, &insize, &outbuf, &outsize);
 #else