Skip to content

Commit c1fb7f8

Browse files
SteveMaas1978SteveMaas1978
committed
Fixed potential crash when loading files with unnamed parameters.
1 parent 2fb37e2 commit c1fb7f8

1 file changed

Lines changed: 43 additions & 43 deletions

File tree

‎FSCore/ParamBlock.cpp‎

Lines changed: 43 additions & 43 deletions
Original file line numberDiff line numberDiff line change
@@ -488,8 +488,8 @@ Param::Param(int n, Param_Type ntype, const char* szb, const char* szn)
488488
assert((ntype == Param_INT) || (ntype == Param_CHOICE));
489489
m_ntype = ntype;
490490
m_nsize = 0;
491-
m_brev = szb;
492-
m_name = (szn == 0 ? szb : szn);
491+
m_brev = (szb == 0 ? "" : szb);
492+
m_name = (szn == 0 ? m_brev : szn);
493493
m_szenum = 0;
494494
m_szunit = 0;
495495
m_nstate = Param_ALLFLAGS;
@@ -517,8 +517,8 @@ Param::Param(int n, const char* szb, const char* szn)
517517
m_pd = pi;
518518
m_ntype = Param_INT;
519519
m_nsize = 0;
520-
m_brev = szb;
521-
m_name = (szn == 0 ? szb : szn);
520+
m_brev = (szb == 0 ? "" : szb);
521+
m_name = (szn == 0 ? m_brev : szn);
522522
m_szenum = 0;
523523
m_szunit = 0;
524524
m_nstate = Param_ALLFLAGS;
@@ -546,8 +546,8 @@ Param::Param(double d, const char* szb, const char* szn)
546546
m_pd = pd;
547547
m_ntype = Param_FLOAT;
548548
m_nsize = 0;
549-
m_brev = szb;
550-
m_name = (szn == 0 ? szb : szn);
549+
m_brev = (szb == 0 ? "" : szb);
550+
m_name = (szn == 0 ? m_brev : szn);
551551
m_szenum = 0;
552552
m_szunit = 0;
553553
m_nstate = Param_ALLFLAGS;
@@ -575,8 +575,8 @@ Param::Param(double d, const char* szunit, const char* szb, const char* szn)
575575
m_pd = pd;
576576
m_ntype = Param_FLOAT;
577577
m_nsize = 0;
578-
m_brev = szb;
579-
m_name = (szn == 0 ? szb : szn);
578+
m_brev = (szb == 0 ? "" : szb);
579+
m_name = (szn == 0 ? m_brev : szn);
580580
m_szenum = 0;
581581
m_szunit = szunit;
582582
m_nstate = Param_ALLFLAGS;
@@ -604,8 +604,8 @@ Param::Param(bool b, const char* szb, const char* szn)
604604
m_pd = pb;
605605
m_ntype = Param_BOOL;
606606
m_nsize = 0;
607-
m_brev = szb;
608-
m_name = (szn == 0 ? szb : szn);
607+
m_brev = (szb == 0 ? "" : szb);
608+
m_name = (szn == 0 ? m_brev : szn);
609609
m_szenum = 0;
610610
m_szunit = 0;
611611
m_nstate = Param_ALLFLAGS;
@@ -633,8 +633,8 @@ Param::Param(vec3d v, const char* szb, const char* szn)
633633
m_pd = pv;
634634
m_ntype = Param_VEC3D;
635635
m_nsize = 0;
636-
m_brev = szb;
637-
m_name = (szn == 0 ? szb : szn);
636+
m_brev = (szb == 0 ? "" : szb);
637+
m_name = (szn == 0 ? m_brev : szn);
638638
m_szenum = 0;
639639
m_szunit = 0;
640640
m_nstate = Param_ALLFLAGS;
@@ -663,8 +663,8 @@ Param::Param(vec2i v, const char* szb, const char* szn)
663663
m_pd = pv;
664664
m_ntype = Param_VEC2I;
665665
m_nsize = 0;
666-
m_brev = szb;
667-
m_name = (szn == 0 ? szb : szn);
666+
m_brev = (szb == 0 ? "" : szb);
667+
m_name = (szn == 0 ? m_brev : szn);
668668
m_szenum = 0;
669669
m_szunit = 0;
670670
m_nstate = Param_ALLFLAGS;
@@ -692,8 +692,8 @@ Param::Param(vec2d v, const char* szb, const char* szn)
692692
m_pd = pv;
693693
m_ntype = Param_VEC2D;
694694
m_nsize = 0;
695-
m_brev = szb;
696-
m_name = (szn == 0 ? szb : szn);
695+
m_brev = (szb == 0 ? "" : szb);
696+
m_name = (szn == 0 ? m_brev : szn);
697697
m_szenum = 0;
698698
m_szunit = 0;
699699
m_nstate = Param_ALLFLAGS;
@@ -720,8 +720,8 @@ Param::Param(mat2d v, const char* szb, const char* szn)
720720
m_pd = pv;
721721
m_ntype = Param_MAT2D;
722722
m_nsize = 0;
723-
m_brev = szb;
724-
m_name = (szn == 0 ? szb : szn);
723+
m_brev = (szb == 0 ? "" : szb);
724+
m_name = (szn == 0 ? m_brev : szn);
725725
m_szenum = 0;
726726
m_szunit = 0;
727727
m_nstate = Param_ALLFLAGS;
@@ -748,8 +748,8 @@ Param::Param(mat3d v, const char* szb, const char* szn)
748748
m_pd = pv;
749749
m_ntype = Param_MAT3D;
750750
m_nsize = 0;
751-
m_brev = szb;
752-
m_name = (szn == 0 ? szb : szn);
751+
m_brev = (szb == 0 ? "" : szb);
752+
m_name = (szn == 0 ? m_brev : szn);
753753
m_szenum = 0;
754754
m_szunit = 0;
755755
m_nstate = Param_ALLFLAGS;
@@ -777,8 +777,8 @@ Param::Param(mat3ds v, const char* szb, const char* szn)
777777
m_pd = pv;
778778
m_ntype = Param_MAT3DS;
779779
m_nsize = 0;
780-
m_brev = szb;
781-
m_name = (szn == 0 ? szb : szn);
780+
m_brev = (szb == 0 ? "" : szb);
781+
m_name = (szn == 0 ? m_brev : szn);
782782
m_szenum = 0;
783783
m_szunit = 0;
784784
m_nstate = Param_ALLFLAGS;
@@ -805,8 +805,8 @@ Param::Param(GLColor c, const char* szb, const char* szn)
805805
m_pd = pc;
806806
m_ntype = Param_COLOR;
807807
m_nsize = 0;
808-
m_brev = szb;
809-
m_name = (szn == 0 ? szb : szn);
808+
m_brev = (szb == 0 ? "" : szb);
809+
m_name = (szn == 0 ? m_brev : szn);
810810
m_szenum = 0;
811811
m_szunit = 0;
812812
m_nstate = Param_ALLFLAGS;
@@ -833,8 +833,8 @@ Param::Param(const std::vector<int>& v, const char* szb, const char* szn)
833833
m_pd = pc;
834834
m_ntype = Param_STD_VECTOR_INT;
835835
m_nsize = 0;
836-
m_brev = szb;
837-
m_name = (szn == 0 ? szb : szn);
836+
m_brev = (szb == 0 ? "" : szb);
837+
m_name = (szn == 0 ? m_brev : szn);
838838
m_szenum = 0;
839839
m_szunit = 0;
840840
m_nstate = Param_ALLFLAGS;
@@ -860,8 +860,8 @@ Param::Param(const std::vector<double>& v, const char* szb, const char* szn)
860860
m_pd = pc;
861861
m_ntype = Param_STD_VECTOR_DOUBLE;
862862
m_nsize = 0;
863-
m_brev = szb;
864-
m_name = (szn == 0 ? szb : szn);
863+
m_brev = (szb == 0 ? "" : szb);
864+
m_name = (szn == 0 ? m_brev : szn);
865865
m_szenum = 0;
866866
m_szunit = 0;
867867
m_nstate = Param_ALLFLAGS;
@@ -887,8 +887,8 @@ Param::Param(const std::vector<vec2d>& v, const char* szb, const char* szn)
887887
m_pd = pc;
888888
m_ntype = Param_STD_VECTOR_VEC2D;
889889
m_nsize = 0;
890-
m_brev = szb;
891-
m_name = (szn == 0 ? szb : szn);
890+
m_brev = (szb == 0 ? "" : szb);
891+
m_name = (szn == 0 ? m_brev : szn);
892892
m_szenum = 0;
893893
m_szunit = 0;
894894
m_nstate = Param_ALLFLAGS;
@@ -915,8 +915,8 @@ Param::Param(const std::string& val, const char* szb, const char* szn)
915915
m_pd = pv;
916916
m_ntype = Param_STRING;
917917
m_nsize = 0;
918-
m_brev = szb;
919-
m_name = (szn == 0 ? szb : szn);
918+
m_brev = (szb == 0 ? "" : szb);
919+
m_name = (szn == 0 ? m_brev : szn);
920920
m_szenum = 0;
921921
m_szunit = 0;
922922
m_nstate = Param_ALLFLAGS;
@@ -946,8 +946,8 @@ Param::Param(const int* v, int nsize, const char* szb, const char* szn)
946946
m_pd = pc;
947947
m_ntype = Param_ARRAY_INT;
948948
m_nsize = nsize;
949-
m_brev = szb;
950-
m_name = (szn == 0 ? szb : szn);
949+
m_brev = (szb == 0 ? "" : szb);
950+
m_name = (szn == 0 ? m_brev : szn);
951951
m_szenum = 0;
952952
m_szunit = 0;
953953
m_nstate = Param_ALLFLAGS;
@@ -977,8 +977,8 @@ Param::Param(const double* v, int nsize, const char* szb, const char* szn)
977977
m_pd = pc;
978978
m_ntype = Param_ARRAY_DOUBLE;
979979
m_nsize = nsize;
980-
m_brev = szb;
981-
m_name = (szn == 0 ? szb : szn);
980+
m_brev = (szb == 0 ? "" : szb);
981+
m_name = (szn == 0 ? m_brev : szn);
982982
m_szenum = 0;
983983
m_szunit = 0;
984984
m_nstate = Param_ALLFLAGS;
@@ -1006,8 +1006,8 @@ Param::Param(int n, const char* szi, int idx, const char* szb, const char* szn)
10061006
m_pd = pi;
10071007
m_ntype = Param_INT;
10081008
m_nsize = 0;
1009-
m_brev = szb;
1010-
m_name = (szn == 0 ? szb : szn);
1009+
m_brev = (szb == 0 ? "" : szb);
1010+
m_name = (szn == 0 ? m_brev : szn);
10111011
m_szenum = 0;
10121012
m_szindx = szi;
10131013
m_nindx = idx;
@@ -1035,11 +1035,11 @@ Param::Param(double d, const char* szi, int idx, const char* szb, const char* sz
10351035
m_pd = pd;
10361036
m_ntype = Param_FLOAT;
10371037
m_nsize = 0;
1038-
m_brev = szb;
1039-
m_name = (szn == 0 ? szb : szn);
1038+
m_brev = (szb == 0 ? "" : szb);
1039+
m_name = (szn == 0 ? m_brev : szn);
10401040
m_szenum = 0;
10411041
m_szindx = szi;
1042-
m_nindx = idx;
1042+
m_nindx = idx;
10431043
m_szunit = 0;
10441044
m_nstate = Param_ALLFLAGS;
10451045
m_flags = 0;
@@ -1064,8 +1064,8 @@ Param::Param(double d, const char* szi, int idx, const char* szunit, const char*
10641064
*pd = d;
10651065
m_ntype = Param_FLOAT;
10661066
m_nsize = 0;
1067-
m_brev = szb;
1068-
m_name = (szn == 0 ? szb : szn);
1067+
m_brev = (szb == 0 ? "" : szb);
1068+
m_name = (szn == 0 ? m_brev : szn);
10691069
m_szenum = 0;
10701070
m_szindx = szi;
10711071
m_nindx = idx;

0 commit comments

Comments
 (0)