Skip to content

J
jquery
Commit 8cd50a39 authored by Ariel Flesler's avatar Ariel Flesler
Browse files
Options

jquery core: Closes #3737. Fixed a possible null dereference.

parent eff400e4
Hide whitespace changes
Inline Side-by-side
Showing with 7 additions and 5 deletions
src/core.js
View file @ 8cd50a39
...@@ -1016,12 +1016,14 @@ jQuery.extend({ ...@@ -1016,12 +1016,14 @@ jQuery.extend({
if ( fragment ) { if ( fragment ) {
for ( var i = 0; ret[i]; i++ ) { for ( var i = 0; ret[i]; i++ ) {
if ( jQuery.nodeName( ret[i], "script" ) ) { elem = ret[i];
ret[i].parentNode.removeChild( ret[i] ); if ( jQuery.nodeName( elem, "script" ) ) {
if( elem.parentNode )
elem.parentNode.removeChild( elem );
} else { } else {
if ( ret[i].nodeType === 1 ) if ( elem.nodeType === 1 )
ret = jQuery.merge( ret, ret[i].getElementsByTagName("script")); ret = jQuery.merge( ret, elem.getElementsByTagName("script"));
fragment.appendChild( ret[i] ); fragment.appendChild( elem );
} }
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment