Apply ecgp_sqlstate-v2.diff

Author: hackorum

doc/src/sgml/ecpg.sgml

@@ -5050,6 +5050,7 @@ struct
     long sqlerrd[6];
     char sqlwarn[8];
     char sqlstate[5];
+    char sqlstatepad;
 } sqlca;
 </programlisting>
     (In a multithreaded program, every thread automatically gets its
@@ -5199,6 +5200,11 @@ sqlstate: 42P01
     throughout all applications.  For further information see
     <xref linkend="errcodes-appendix"/>.
    </para>
+   <para>
+    <literal>sqlca.sqlstate</literal> field is a non-terminated character
+    array, in order to guard against accidental uses as a C string it is
+    followed by a padding nul character.
+   </para>
 
    <para>
     <literal>SQLCODE</literal>, the deprecated error code scheme, is a

src/interfaces/ecpg/ecpglib/misc.c

@@ -52,7 +52,8 @@ static struct sqlca_t sqlca_init =
 	},
 	{
 		'0', '0', '0', '0', '0'
-	}
+	},
+	'\0'
 };
 
 static pthread_key_t sqlca_key;
@@ -276,8 +277,8 @@ ecpg_log(const char *format, ...)
 		/* dump out internal sqlca variables */
 		if (ecpg_internal_regression_mode && sqlca != NULL)
 		{
-			fprintf(debugstream, "[NO_PID]: sqlca: code: %ld, state: %s\n",
-					sqlca->sqlcode, sqlca->sqlstate);
+			fprintf(debugstream, "[NO_PID]: sqlca: code: %ld, state: %.*s\n",
+					sqlca->sqlcode, (int) sizeof(sqlca->sqlstate), sqlca->sqlstate);
 		}
 
 		fflush(debugstream);

src/interfaces/ecpg/include/sqlca.h

@@ -51,6 +51,7 @@ struct sqlca_t
 	/* 7: empty						*/
 
 	char		sqlstate[5];
+	char		sqlstatepad;	/* nul terminator for sqlstate */
 };
 
 struct sqlca_t *ECPGget_sqlca(void);

src/interfaces/ecpg/test/expected/compat_informix-test_informix2.c

@@ -68,6 +68,7 @@ struct sqlca_t
 	/* 7: empty						*/
 
 	char		sqlstate[5];
+	char		sqlstatepad;	/* nul terminator for sqlstate */
 };
 
 struct sqlca_t *ECPGget_sqlca(void);

src/interfaces/ecpg/test/expected/preproc-init.c

@@ -62,6 +62,7 @@ struct sqlca_t
 	/* 7: empty						*/
 
 	char		sqlstate[5];
+	char		sqlstatepad;	/* nul terminator for sqlstate */
 };
 
 struct sqlca_t *ECPGget_sqlca(void);

src/interfaces/ecpg/test/expected/sql-array.c

@@ -75,6 +75,7 @@ struct sqlca_t
 	/* 7: empty						*/
 
 	char		sqlstate[5];
+	char		sqlstatepad;	/* nul terminator for sqlstate */
 };
 
 struct sqlca_t *ECPGget_sqlca(void);

src/interfaces/ecpg/test/expected/sql-code100.c

@@ -62,6 +62,7 @@ struct sqlca_t
 	/* 7: empty						*/
 
 	char		sqlstate[5];
+	char		sqlstatepad;	/* nul terminator for sqlstate */
 };
 
 struct sqlca_t *ECPGget_sqlca(void);

src/interfaces/ecpg/test/expected/sql-copystdout.c

@@ -64,6 +64,7 @@ struct sqlca_t
 	/* 7: empty						*/
 
 	char		sqlstate[5];
+	char		sqlstatepad;	/* nul terminator for sqlstate */
 };
 
 struct sqlca_t *ECPGget_sqlca(void);

src/interfaces/ecpg/test/expected/sql-declare.c

@@ -70,6 +70,7 @@ struct sqlca_t
 	/* 7: empty						*/
 
 	char		sqlstate[5];
+	char		sqlstatepad;	/* nul terminator for sqlstate */
 };
 
 struct sqlca_t *ECPGget_sqlca(void);

src/interfaces/ecpg/test/expected/sql-define.c

@@ -77,6 +77,7 @@ struct sqlca_t
 	/* 7: empty						*/
 
 	char		sqlstate[5];
+	char		sqlstatepad;	/* nul terminator for sqlstate */
 };
 
 struct sqlca_t *ECPGget_sqlca(void);