1 files changed, 11 insertions, 8 deletions

diff --git a/linden/indra/newview/llpanelpick.cpp b/linden/indra/newview/llpanelpick.cpp
index 4c9d5c3..ddd7934 100644
--- a/linden/indra/newview/llpanelpick.cpp
+++ b/linden/indra/newview/llpanelpick.cpp
@@ -289,10 +289,10 @@ void LLPanelPick::processPickInfoReply(LLMessageSystem *msg, void **)
     LLUUID parcel_id;
     msg->getUUID("Data", "ParcelID", parcel_id);
 
-        char name[DB_PARCEL_NAME_SIZE];
+        char name[DB_PARCEL_NAME_SIZE];         /*Flawfinder: ignore*/
         msg->getString("Data", "Name", DB_PARCEL_NAME_SIZE, name);
 
-        char desc[DB_PICK_DESC_SIZE];
+        char desc[DB_PICK_DESC_SIZE];           /*Flawfinder: ignore*/
         msg->getString("Data", "Desc", DB_PICK_DESC_SIZE, desc);
 
         LLUUID snapshot_id;
@@ -300,7 +300,7 @@ void LLPanelPick::processPickInfoReply(LLMessageSystem *msg, void **)
 
     // "Location text" is actually the owner name, the original
     // name that owner gave the parcel, and the location.
-        char buffer[256];
+        char buffer[256];               /*Flawfinder: ignore*/
     LLString location_text;
 
     msg->getString("Data", "User", 256, buffer);
@@ -314,7 +314,7 @@ void LLPanelPick::processPickInfoReply(LLMessageSystem *msg, void **)
                 location_text.append(", ");
         }
 
-        char sim_name[256];
+        char sim_name[256];             /*Flawfinder: ignore*/
         msg->getString("Data", "SimName", 256, sim_name);
 
         LLVector3d pos_global;
@@ -324,7 +324,7 @@ void LLPanelPick::processPickInfoReply(LLMessageSystem *msg, void **)
     S32 region_y = llround((F32)pos_global.mdV[VY]) % REGION_WIDTH_UNITS;
         S32 region_z = llround((F32)pos_global.mdV[VZ]);
    
-    sprintf(buffer, "%s (%d, %d, %d)", sim_name, region_x, region_y, region_z);
+    snprintf(buffer, sizeof(buffer), "%s (%d, %d, %d)", sim_name, region_x, region_y, region_z);                /*Flawfinder: ignore*/
     location_text.append(buffer);
 
         S32 sort_order;
@@ -359,7 +359,7 @@ void LLPanelPick::processPickInfoReply(LLMessageSystem *msg, void **)
         self->mLocationEditor->setText(location_text);
         self->mEnabledCheck->set(enabled);
 
-                sprintf(buffer, "%d", sort_order);
+                snprintf(buffer, sizeof(buffer), "%d", sort_order);             /*Flawfinder: ignore*/
                 self->mSortOrderEditor->setText(buffer);
     }
 }
@@ -506,8 +506,11 @@ void LLPanelPick::onCommitAny(LLUICtrl* ctrl, void* data)
                 }
                 else
                 {*/
-                        LLTabContainerVertical* tab = (LLTabContainerVertical*)self->getParent();
-                        tab->setCurrentTabName(self->mNameEditor->getText());
+                LLTabContainerVertical* tab = (LLTabContainerVertical*)self->getParent();
+                if (tab)
+                {
+                        if(tab) tab->setCurrentTabName(self->mNameEditor->getText());
+                }
                 //}
         }
 }