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

(-)src/main/summary.c (-6 / +7 lines)
Lines 596-609 Link Here
596
			    (iop == 2 && tmp < zcum.r) ||
596
			    (iop == 2 && tmp < zcum.r) ||
597
			    (iop == 3 && tmp > zcum.r))	zcum.r = tmp;
597
			    (iop == 3 && tmp > zcum.r))	zcum.r = tmp;
598
		    } else if(ans_type == STRSXP) {
598
		    } else if(ans_type == STRSXP) {
599
		        if(int_a)
600
			   stmp = StringFromInteger(itmp, &warn);
601
		        if(real_a)
602
			   stmp = StringFromReal(tmp, &warn);
603
599
			if(empty) scum = stmp;
604
			if(empty) scum = stmp;
600
			else if (scum != NA_STRING) {
605
			else if (scum != NA_STRING) {
601
			    if(int_a)
606
			    PROTECT(stmp); 
602
				stmp = StringFromInteger(itmp, &warn);
607
			    if(empty || stmp == NA_STRING ||
603
			    if(real_a)
604
				stmp = StringFromReal(tmp, &warn);
605
			    PROTECT(stmp);
606
			    if(stmp == NA_STRING ||
607
			       (iop == 2 && stmp != scum && Scollate(stmp, scum) < 0) ||
608
			       (iop == 2 && stmp != scum && Scollate(stmp, scum) < 0) ||
608
			       (iop == 3 && stmp != scum && Scollate(stmp, scum) > 0) )
609
			       (iop == 3 && stmp != scum && Scollate(stmp, scum) > 0) )
609
				scum = stmp;
610
				scum = stmp;

Return to bug 17160