kc3-lang/angle/src/compiler/preprocessor/64bit-tokenizer-safety.patch

Branch : - branch - main - tag -

• Show log

  Commit

• Author : Geoff Lang
  Date : 2016-09-20 10:22:55
  Hash : 93561c3a
  Message : Regenerate the preprocessor with the latest versions of flex and bison. BUG=648063 Change-Id: Ia90d12c8cb4ae0a694227145267e78ca02dcc2b0 Reviewed-on: https://chromium-review.googlesource.com/387114 Commit-Queue: Geoff Lang <geofflang@chromium.org> Reviewed-by: Jamie Madill <jmadill@chromium.org> Reviewed-by: Corentin Wallez <cwallez@chromium.org>

• src/compiler/preprocessor/64bit-tokenizer-safety.patch

• diff --git a/src/compiler/preprocessor/Tokenizer.cpp b/src/compiler/preprocessor/Tokenizer.cpp
  index 0d7ad58..5ef0e5e 100644
  --- a/src/compiler/preprocessor/Tokenizer.cpp
  +++ b/src/compiler/preprocessor/Tokenizer.cpp
  @@ -1703,7 +1703,7 @@ static int yy_get_next_buffer (yyscan_t yyscanner)
   	else
   		{
   			int num_to_read =
  -			YY_CURRENT_BUFFER_LVALUE->yy_buf_size - number_to_move - 1;
  +			static_cast<int>(YY_CURRENT_BUFFER_LVALUE->yy_buf_size - number_to_move - 1);
   
   		while ( num_to_read <= 0 )
   			{ /* Not enough room in the buffer - grow it. */
  @@ -1737,8 +1737,8 @@ static int yy_get_next_buffer (yyscan_t yyscanner)
   
   			yyg->yy_c_buf_p = &b->yy_ch_buf[yy_c_buf_p_offset];
   
  -			num_to_read = YY_CURRENT_BUFFER_LVALUE->yy_buf_size -
  -						number_to_move - 1;
  +			num_to_read = static_cast<int>(YY_CURRENT_BUFFER_LVALUE->yy_buf_size -
  +						number_to_move - 1);
   
   			}
   
  @@ -1746,8 +1746,10 @@ static int yy_get_next_buffer (yyscan_t yyscanner)
   			num_to_read = YY_READ_BUF_SIZE;
   
   		/* Read in more data. */
  +		yy_size_t ret = 0;
   		YY_INPUT( (&YY_CURRENT_BUFFER_LVALUE->yy_ch_buf[number_to_move]),
  -			yyg->yy_n_chars, num_to_read );
  +			ret, num_to_read );
  +		yyg->yy_n_chars = static_cast<int>(ret);
   
   		YY_CURRENT_BUFFER_LVALUE->yy_n_chars = yyg->yy_n_chars;
   		}
  @@ -1773,13 +1775,13 @@ static int yy_get_next_buffer (yyscan_t yyscanner)
   
   	if ((int) (yyg->yy_n_chars + number_to_move) > YY_CURRENT_BUFFER_LVALUE->yy_buf_size) {
   		/* Extend the array by 50%, plus the number we really need. */
  -		int new_size = yyg->yy_n_chars + number_to_move + (yyg->yy_n_chars >> 1);
  +		yy_size_t new_size = yyg->yy_n_chars + number_to_move + (yyg->yy_n_chars >> 1);
   		YY_CURRENT_BUFFER_LVALUE->yy_ch_buf = (char *) pprealloc((void *) YY_CURRENT_BUFFER_LVALUE->yy_ch_buf,new_size ,yyscanner );
   		if ( ! YY_CURRENT_BUFFER_LVALUE->yy_ch_buf )
   			YY_FATAL_ERROR( "out of dynamic memory in yy_get_next_buffer()" );
   	}
   
  -	yyg->yy_n_chars += number_to_move;
  +	yyg->yy_n_chars += static_cast<int>(number_to_move);
   	YY_CURRENT_BUFFER_LVALUE->yy_ch_buf[yyg->yy_n_chars] = YY_END_OF_BUFFER_CHAR;
   	YY_CURRENT_BUFFER_LVALUE->yy_ch_buf[yyg->yy_n_chars + 1] = YY_END_OF_BUFFER_CHAR;
   
  @@ -2171,7 +2173,7 @@ void pppop_buffer_state (yyscan_t yyscanner)
    */
   static void ppensure_buffer_stack (yyscan_t yyscanner)
   {
  -	int num_to_alloc;
  +	yy_size_t num_to_alloc;
       struct yyguts_t * yyg = (struct yyguts_t*)yyscanner;
   
   	if (!yyg->yy_buffer_stack) {
  @@ -2238,7 +2240,7 @@ YY_BUFFER_STATE pp_scan_buffer  (char * base, yy_size_t  size , yyscan_t yyscann
   	if ( ! b )
   		YY_FATAL_ERROR( "out of dynamic memory in pp_scan_buffer()" );
   
  -	b->yy_buf_size = size - 2;	/* "- 2" to take care of EOB's */
  +	b->yy_buf_size = static_cast<int>(size - 2);	/* "- 2" to take care of EOB's */
   	b->yy_buf_pos = b->yy_ch_buf = base;
   	b->yy_is_our_buffer = 0;
   	b->yy_input_file = NULL;
  @@ -2293,7 +2295,7 @@ YY_BUFFER_STATE pp_scan_bytes  (yyconst char * yybytes, int  _yybytes_len , yysc
   	if ( ! buf )
   		YY_FATAL_ERROR( "out of dynamic memory in pp_scan_bytes()" );
   
  -	for ( i = 0; i < _yybytes_len; ++i )
  +	for ( i = 0; i < static_cast<yy_size_t>(_yybytes_len); ++i )
   		buf[i] = yybytes[i];
   
   	buf[_yybytes_len] = buf[_yybytes_len+1] = YY_END_OF_BUFFER_CHAR;