MC-15322: Fatal error when selecting Product CMS page design

Cast null $product to DataObject

Author: danmooney2

app/code/Magento/PageBuilder/Block/Catalog/Block/Product/View/Attributes.php

@@ -7,12 +7,29 @@
 
 namespace Magento\PageBuilder\Block\Catalog\Block\Product\View;
 
+use Magento\Framework\DataObject;
+
 class Attributes extends \Magento\Catalog\Block\Product\View\Attributes
 {
     const DISPLAY_ATTRIBUTES_NON_PAGEBUILDER = 'non_pagebuilder';
 
     const DISPLAY_ATTRIBUTES_PAGEBUILDER_ONLY = 'pagebuilder_only';
 
+    /**
+     * @inheritdoc
+     */
+    public function getProduct()
+    {
+        $product = parent::getProduct();
+
+        if (!$product) {
+            $product = new DataObject();
+            $product->setAttributes([]);
+        }
+
+        return $product;
+    }
+
     /**
      * Determine if we should display the attribute on the front-end, add support for exclude page builder & page
      * builder only options on class.

app/code/Magento/PageBuilder/view/frontend/templates/catalog/product/view/attribute_list.phtml

@@ -14,7 +14,7 @@
     $helper = $this->helper(Magento\Catalog\Helper\Output::class);
     $product = $block->getProduct();
 ?>
-<?php if ($product && ($additional = $block->getAdditionalData())) : ?>
+<?php if ($additional = $block->getAdditionalData()) : ?>
     <div class="pagebuilder-attributes-wrapper">
         <?php foreach ($additional as $data) : ?>
             <div class="product-full-width-section">

app/code/Magento/PageBuilder/view/frontend/templates/catalog/product/view/section_wrapper.phtml

@@ -9,7 +9,7 @@
  *
  * @var \Magento\Framework\View\Element\Template $block
  */
-$childHtml = $block->getProduct() ? $block->getChildHtml() : '';
+$childHtml = $block->getChildHtml();
 ?>
 <?php if (trim($childHtml) !== "") : ?>
     <div class="product-full-width-section">