Protect hist classes against calling strlen with nullptr argument

Author: linev

hist/hist/src/TFormula.cxx

@@ -453,7 +453,8 @@ TFormula::TFormula()
 }
 
 ////////////////////////////////////////////////////////////////////////////////
-static bool IsReservedName(const char* name){
+static bool IsReservedName(const char* name)
+{
    if (strlen(name)!=1) return false;
    for (auto const & specialName : {"x","y","z","t"}){
       if (strcmp(name,specialName)==0) return true;

hist/hist/src/TFormula_v5.cxx

@@ -191,7 +191,7 @@ TFormula::TFormula(const char *name,const char *expression) :
 
    //eliminate blanks in expression
    Int_t i,j,nch;
-   nch = strlen(expression);
+   nch = expression ? strlen(expression) : 0;
    char *expr = new char[nch+1];
    j = 0;
    for (i=0;i<nch;i++) {

hist/hist/src/TGraph.cxx

@@ -822,7 +822,7 @@ void TGraph::Draw(Option_t *option)
 
    // If no option is specified, it is defined as "alp" in case there
    // no current pad or if the current pad as no axis defined.
-   if (!strlen(option)) {
+   if (!option || !strlen(option)) {
       if (gPad) {
          if (!gPad->GetListOfPrimitives()->FindObject("TFrame")) opt = "alp";
       } else {

hist/hist/src/TGraphTime.cxx

@@ -174,7 +174,7 @@ void TGraphTime::Paint(Option_t *option)
 void TGraphTime::SaveAnimatedGif(const char *filename) const
 {
    TObject *frame = gPad->GetPrimitive("frame");
-   TList *list = 0;
+   TList *list = nullptr;
    TObjLink *lnk;
 
    for (Int_t s=0;s<fNsteps;s++) {
@@ -190,9 +190,12 @@ void TGraphTime::SaveAnimatedGif(const char *filename) const
             lnk = lnk->Next();
          }
          gPad->Update();
-         if (strlen(filename) > 0) gPad->Print(Form("%s+",filename));
-         else                      gPad->Print(Form("%s+",GetName()));
-         if (fSleepTime > 0) gSystem->Sleep(fSleepTime);
+         if (filename && strlen(filename) > 0)
+            gPad->Print(Form("%s+", filename));
+         else
+            gPad->Print(Form("%s+", GetName()));
+         if (fSleepTime > 0)
+            gSystem->Sleep(fSleepTime);
       }
    }
 }

hist/hist/src/TH1.cxx

@@ -6202,8 +6202,10 @@ void TH1::Paint(Option_t *option)
    GetPainter(option);
 
    if (fPainter) {
-      if (strlen(option) > 0) fPainter->Paint(option);
-      else                    fPainter->Paint(fOption.Data());
+      if (option && strlen(option) > 0)
+         fPainter->Paint(option);
+      else
+         fPainter->Paint(fOption.Data());
    }
 }
 

hist/hist/src/TMultiGraph.cxx

@@ -1132,7 +1132,7 @@ void TMultiGraph::Paint(Option_t *choptin)
 
    char option[128];
    strlcpy(option,choptin,128);
-   Int_t nch = strlen(choptin);
+   Int_t nch = choptin ? strlen(choptin) : 0;
    for (Int_t i=0;i<nch;i++) option[i] = toupper(option[i]);
 
    // Automatic color

hist/hist/src/TPrincipal.cxx

@@ -271,7 +271,7 @@ TPrincipal::TPrincipal(Int_t nVariables, Option_t *opt)
    fIsNormalised       = kFALSE;
    fNumberOfDataPoints = 0;
    fNumberOfVariables  = nVariables;
-   while (strlen(opt) > 0) {
+   while (opt && strlen(opt) > 0) {
       switch(*opt++) {
          case 'N':
          case 'n':
@@ -580,7 +580,7 @@ void TPrincipal::MakeHistograms(const char *name, Option_t *opt)
    Bool_t makeE  = kFALSE;
    Bool_t makeS  = kFALSE;
 
-   Int_t len     = strlen(opt);
+   Int_t len     = opt ? strlen(opt) : 0;
    Int_t i,j,k;
    for (i = 0; i < len; i++) {
       switch (opt[i]) {
@@ -1090,7 +1090,7 @@ void TPrincipal::Print(Option_t *opt) const
    Bool_t printS = kFALSE;
    Bool_t printE = kFALSE;
 
-   Int_t len     = strlen(opt);
+   Int_t len     = opt ? strlen(opt) : 0;
    for (Int_t i = 0; i < len; i++) {
       switch (opt[i]) {
          case 'V':

hist/hist/src/TProfile2D.cxx

@@ -1820,7 +1820,7 @@ TProfile2D * TProfile2D::Rebin2D(Int_t nxgroup ,Int_t nygroup,const char * newna
    }
    //nxgroup == nygroup == 1
    else{
-      if((newname) && (strlen(newname) > 0))
+      if(newname && (strlen(newname) > 0))
          return (TProfile2D*)Clone(newname);
       else
          return this;