postgrespro.git / summary / log / commit / refs

commit    08cecfaf60c484f219ba7e6ee23e9699aea4e9af
Author:   Michael Meskes <meskes@postgresql.org>
Date:     Mon Mar 11 15:11:16 2019 +0000

    Fix potential memory access violation in ecpg if filename of include file is
    shorter than 2 characters.
    
    Patch by: "Wu, Fei" <wufei.fnst@cn.fujitsu.com>


 src/interfaces/ecpg/preproc/pgc.l | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/interfaces/ecpg/preproc/pgc.l b/src/interfaces/ecpg/preproc/pgc.l
index 3f7a5d7999..60474b0b4a 100644
--- a/src/interfaces/ecpg/preproc/pgc.l
+++ b/src/interfaces/ecpg/preproc/pgc.l
@@ -1538,7 +1538,7 @@ parse_include(void)
 		yyin = fopen(inc_file, "r");
 		if (!yyin)
 		{
-			if (strcmp(inc_file + strlen(inc_file) - 2, ".h") != 0)
+			if (strlen(inc_file) <= 2 || strcmp(inc_file + strlen(inc_file) - 2, ".h") != 0)
 			{
 				strcat(inc_file, ".h");
 				yyin = fopen(inc_file, "r");


[parent: 98bdaab0d918]