cvs commit: ponie/perl scope.c

[email protected] (Nicholas Clark) 13 Oct 2004 13:30:20 -0000
Newsgroups perl.ponie.changes
Message-ID <[email protected]>
cvsuser     04/10/13 06:30:20

  Modified:    perl     scope.c
  Log:
  Propagate change 22578 from blead (NULL pointer protection in S_save_scalar_at)
  
  Revision  Changes    Path
  1.6       +2 -2      ponie/perl/scope.c
  
  Index: scope.c
  ===================================================================
  RCS file: /cvs/public/ponie/perl/scope.c,v
  retrieving revision 1.5
  retrieving revision 1.6
  diff -u -w -r1.5 -r1.6
  --- scope.c	24 Jun 2004 14:31:34 -0000	1.5
  +++ scope.c	13 Oct 2004 13:30:20 -0000	1.6
  @@ -230,8 +230,8 @@
   	/* if it's a special scalar or if it has no 'set' magic,
   	 * propagate the SvREADONLY flag. --rgs 20030922 */
   	for (mg = SvMAGIC(sv); mg; mg = mg->mg_moremagic) {
  -	    if (SvMAGIC(sv)->mg_type == '\0'
  -		    || !SvMAGIC(sv)->mg_virtual->svt_set)
  +	    if (mg->mg_type == '\0'
  +		    || !(mg->mg_virtual && mg->mg_virtual->svt_set))
   	    {
   		SvFLAGS(sv) |= SvREADONLY(osv);
   		break;