Fix warnings of casting and null pointer handling

Reviewed By: emilsjolander Differential Revision: D6675111 fbshipit-source-id: 884659fabb05033b4d43d3aa6629e22481d39b7e
facebook · Jan 9, 2018 · a8d4666 · a8d4666
1 parent 11a495c
commit a8d4666
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 6 deletions.
diff --git a/ReactCommon/yoga/yoga/YGNode.cpp b/ReactCommon/yoga/yoga/YGNode.cpp
@@ -385,7 +385,7 @@ void YGNode::cloneChildrenIfNeeded() {
   // YGNodeRemoveChild in yoga.cpp has a forked variant of this algorithm
   // optimized for deletions.
 
-  const uint32_t childCount = children_.size();
+  const uint32_t childCount = static_cast<uint32_t>(children_.size());
   if (childCount == 0) {
     // This is an empty set. Nothing to clone.
     return;

diff --git a/ReactCommon/yoga/yoga/YGNodePrint.cpp b/ReactCommon/yoga/yoga/YGNodePrint.cpp
@@ -212,7 +212,7 @@ void YGNodeToString(
   }
   appendFormatedString(str, ">");
 
-  const uint32_t childCount = node->getChildren().size();
+  const uint32_t childCount = static_cast<uint32_t>(node->getChildren().size());
   if (options & YGPrintOptionsChildren && childCount > 0) {
     for (uint32_t i = 0; i < childCount; i++) {
       appendFormatedString(str, "\n");

diff --git a/ReactCommon/yoga/yoga/Yoga.cpp b/ReactCommon/yoga/yoga/Yoga.cpp
@@ -321,7 +321,9 @@ YGConfigRef YGConfigGetDefault() {
 YGConfigRef YGConfigNew(void) {
   const YGConfigRef config = (const YGConfigRef)malloc(sizeof(YGConfig));
   YGAssert(config != nullptr, "Could not allocate memory for config");
-
+  if (config == nullptr) {
+    abort();
+  }
   gConfigInstanceCount++;
   memcpy(config, &gYGConfigDefaults, sizeof(YGConfig));
   return config;
@@ -433,7 +435,7 @@ YGNodeRef YGNodeGetChild(const YGNodeRef node, const uint32_t index) {
 }
 
 uint32_t YGNodeGetChildCount(const YGNodeRef node) {
-  return node->getChildren().size();
+  return static_cast<uint32_t>(node->getChildren().size());
 }
 
 YGNodeRef YGNodeGetParent(const YGNodeRef node) {
@@ -1895,7 +1897,7 @@ static void YGNodelayoutImpl(const YGNodeRef node,
     return;
   }
 
-  const uint32_t childCount = node->getChildren().size();
+  const uint32_t childCount = YGNodeGetChildCount(node);
   if (childCount == 0) {
     YGNodeEmptyContainerSetMeasuredDimensions(node,
                                               availableWidth,
@@ -3556,7 +3558,7 @@ static void YGRoundToPixelGrid(const YGNodeRef node,
               absoluteNodeTop, pointScaleFactor, false, textRounding),
       YGDimensionHeight);
 
-  const uint32_t childCount = node->getChildren().size();
+  const uint32_t childCount = YGNodeGetChildCount(node);
   for (uint32_t i = 0; i < childCount; i++) {
     YGRoundToPixelGrid(YGNodeGetChild(node, i), pointScaleFactor, absoluteNodeLeft, absoluteNodeTop);
   }