Attachment #141804 for bug #207385

View | Details | Raw Unified | Return to bug 207385
Collapse All | Expand All




      case syntax_element_restart_continue:
      case syntax_element_jump:
      case syntax_element_startmark:
      case syntax_element_backstep:
         // can't legally repeat any of the above:
         fail(regex_constants::error_badrepeat, m_position - m_base);
         return false;

   if(markid == -4)
   {
      re_syntax_base* b = this->getaddress(expected_alt_point);
      // Make sure we have exactly one alternative following this state:
      if(b->type != syntax_element_alt)
      {
         re_alt* alt = static_cast<re_alt*>(this->insert_state(expected_alt_point, syntax_element_alt, sizeof(re_alt)));

         fail(regex_constants::error_bad_pattern, m_position - m_base);
         return false;
      }
      // check for invalid repetition of next state:
      b = this->getaddress(expected_alt_point);
      b = this->getaddress(static_cast<re_alt*>(b)->next.i, b);
      if((b->type != syntax_element_assert_backref)
         && (b->type != syntax_element_startmark))
      {
         fail(regex_constants::error_badrepeat, m_position - m_base);
      }
   }
   //
   // append closing parenthesis state:
   //
   pb = static_cast<re_brace*>(this->append_state(syntax_element_endmark, sizeof(re_brace)));
         return false;
   pb->index = markid;
   this->m_paren_start = last_paren_start;
   //

Lines 122-125 Link Here

(-)/trunk/libs/regex/test/regress/test_perl_ex.cpp (+11 lines)
122	TEST_INVALID_REGEX("(?:(a)\|b)(?(?<", perl);	122	TEST_INVALID_REGEX("(?:(a)\|b)(?(?<", perl);
123	TEST_INVALID_REGEX("(?:(a)\|b)(?(?<a", perl);	123	TEST_INVALID_REGEX("(?:(a)\|b)(?(?<a", perl);
		124
		125	TEST_INVALID_REGEX("(?(?!#?)+)", perl);
		126	TEST_INVALID_REGEX("(?(?=:-){0})", perl);
		127	TEST_INVALID_REGEX("(?(123){1})", perl);
		128	TEST_INVALID_REGEX("(?(?<=A)*)", perl);
		129	TEST_INVALID_REGEX("(?(?<=A)+)", perl);
		130
		131	TEST_INVALID_REGEX("(?<!*\|^)", perl);
		132	TEST_INVALID_REGEX("(?<!*\|A)", perl);
		133	TEST_INVALID_REGEX("(?<=?\|A)", perl);
		134	TEST_INVALID_REGEX("(?<=*\|\\B)", perl);
124	}	135	}
125		136

Return to bug 207385

Lines 777-782 Link Here

(-)boost/regex/v4/basic_regex_parser.hpp.orig (+11 lines)
777	case syntax_element_restart_continue:	777	case syntax_element_restart_continue:
778	case syntax_element_jump:	778	case syntax_element_jump:
779	case syntax_element_startmark:	779	case syntax_element_startmark:
		780	case syntax_element_backstep:
780	// can't legally repeat any of the above:	781	// can't legally repeat any of the above:
781	fail(regex_constants::error_badrepeat, m_position - m_base);	782	fail(regex_constants::error_badrepeat, m_position - m_base);
782	return false;	783	return false;
Lines 1862-1867 Link Here
1862	if(markid == -4)	1863	if(markid == -4)
1863	{	1864	{
1864	re_syntax_base* b = this->getaddress(expected_alt_point);	1865	re_syntax_base* b = this->getaddress(expected_alt_point);
		1866	// Make sure we have exactly one alternative following this state:
1865	if(b->type != syntax_element_alt)	1867	if(b->type != syntax_element_alt)
1866	{	1868	{
1867	re_alt* alt = static_cast<re_alt*>(this->insert_state(expected_alt_point, syntax_element_alt, sizeof(re_alt)));	1869	re_alt* alt = static_cast<re_alt*>(this->insert_state(expected_alt_point, syntax_element_alt, sizeof(re_alt)));
Lines 1872-1882 Link Here
1872	fail(regex_constants::error_bad_pattern, m_position - m_base);	1874	fail(regex_constants::error_bad_pattern, m_position - m_base);
1873	return false;	1875	return false;
1874	}	1876	}
		1877	// check for invalid repetition of next state:
		1878	b = this->getaddress(expected_alt_point);
		1879	b = this->getaddress(static_cast<re_alt*>(b)->next.i, b);
		1880	if((b->type != syntax_element_assert_backref)
		1881	&& (b->type != syntax_element_startmark))
		1882	{
		1883	fail(regex_constants::error_badrepeat, m_position - m_base);
		1884	}
1875	}	1885	}
1876	//	1886	//
1877	// append closing parenthesis state:	1887	// append closing parenthesis state:
1878	//	1888	//
1879	pb = static_cast<re_brace*>(this->append_state(syntax_element_endmark, sizeof(re_brace)));	1889	pb = static_cast<re_brace*>(this->append_state(syntax_element_endmark, sizeof(re_brace)));
		1890	return false;
1880	pb->index = markid;	1891	pb->index = markid;
1881	this->m_paren_start = last_paren_start;	1892	this->m_paren_start = last_paren_start;
1882	//	1893	//