Advertisement
Not a member of Pastebin yet?
Sign Up,
it unlocks many cool features!
- --- a/src/jdlib/loader.cpp 2015-12-04 01:45:18.298704045 +0900
- +++ b/src/jdlib/loader.cpp 2015-12-04 01:46:01.157667629 +0900
- @@ -878,7 +878,7 @@ void Loader::run_main()
- errmsg = "skip_chunk() failed : " + m_data.url;
- goto EXIT_LOADING;
- }
- - if( ! read_size ) continue;
- + if( ! read_size ) break;
- }
- // 圧縮されていない時はそのままコールバック呼び出し
- --- a/src/xml/dom.cpp 2015-12-04 23:53:19.792643076 +0900
- +++ b/src/xml/dom.cpp 2015-12-04 23:55:07.026756042 +0900
- @@ -39,6 +39,7 @@ Dom::Dom( const int& type, const std::st
- m_static_html_elements.insert( "br" );
- m_static_html_elements.insert( "hr" );
- m_static_html_elements.insert( "img" );
- + m_static_html_elements.insert( "input" );
- m_static_html_elements.insert( "link" );
- m_static_html_elements.insert( "meta" );
- }
- @@ -188,7 +189,7 @@ void Dom::parse( const std::string& str
- current_pos = close_tag_gt_pos + 1;
- // タグの中身を取り出す
- - const std::string close_tag = str.substr( close_tag_lt_pos + 1, close_tag_gt_pos - close_tag_lt_pos - 1 );
- + const std::string close_tag = MISC::tolower_str( str.substr( close_tag_lt_pos + 1, close_tag_gt_pos - close_tag_lt_pos - 1 ) );
- // タグ構造が壊れてる場合
- if( close_tag.empty() ) continue;
- @@ -199,10 +200,10 @@ void Dom::parse( const std::string& str
- }
- // 空要素でない同名の開始タグを見つけたらカウントを増やす
- - if( close_tag.compare( 0, element_name.length(), element_name ) == 0
- + if( close_tag.compare( 0, name.length(), name ) == 0
- && close_tag.compare( close_tag.length() - 1, 1, "/" ) != 0 ) ++count;
- // 終了タグを見つけたらカウントを減らす
- - else if( close_tag.compare( 0, element_name.length() + 1, "/" + element_name ) == 0 ) --count;
- + else if( close_tag.compare( 0, name.length() + 1, "/" + name ) == 0 ) --count;
- // 終了タグを見つける必要数が 0 になったらループを抜ける
- if( count <= 0 ) break;
Advertisement
Add Comment
Please, Sign In to add comment
Advertisement