]> granicus.if.org Git - esp-idf/commitdiff
Initialized some uninitialized variables in rtc_clk.c and ringbuf.c.
authorPieter du Preez <pdupreez@gmail.com>
Mon, 24 Dec 2018 11:37:09 +0000 (11:37 +0000)
committerMahavir Jain <mahavir@espressif.com>
Wed, 23 Jan 2019 11:17:23 +0000 (16:47 +0530)
The following 2 compiler warnings are only reproducible when setting:
   OPTIMIZATION_FLAGS = -Ofast

esp-idf/components/soc/esp32/rtc_clk.c:
In function 'rtc_clk_cpu_freq_get':
esp-idf/components/soc/esp32/rtc_clk.c:506:12:
error: 'freq' may be used uninitialized in this function
[-Werror=maybe-uninitialized]
return freq;

esp-idf/components/esp_ringbuf/ringbuf.c:
In function 'xRingbufferReceiveSplitFromISR':
esp-idf/components/esp_ringbuf/ringbuf.c:934:26:
error: 'pvTempTailItem' may be used uninitialized in this function
[-Werror=maybe-uninitialized]
*ppvTailItem = pvTempTailItem;

Closes https://github.com/espressif/esp-idf/pull/2878

components/esp_ringbuf/ringbuf.c
components/soc/esp32/rtc_clk.c

index 9a7117b74cca0ccf7efd6e237fee7f4a065af7f6..558b61c6d8508a9469ae4b69fca9fb51604e617c 100644 (file)
@@ -920,7 +920,7 @@ BaseType_t xRingbufferReceiveSplitFromISR(RingbufHandle_t xRingbuffer, void **pp
     configASSERT(ppvHeadItem != NULL && ppvTailItem != NULL);
 
     //Attempt to retrieve multiple items
-    void *pvTempHeadItem, *pvTempTailItem;
+    void *pvTempHeadItem = NULL, *pvTempTailItem = NULL;
     size_t xTempHeadSize, xTempTailSize;
     if (prvReceiveGenericFromISR(pxRingbuffer, &pvTempHeadItem, &pvTempTailItem, &xTempHeadSize, &xTempTailSize, 0) == pdTRUE) {
         //At least one item was received
index 0afde2cff662a7866e4cfdb7b215d54c152233e7..4a917c8bb996e394984198a3ebb876314fe2bb9e 100644 (file)
@@ -500,7 +500,7 @@ rtc_cpu_freq_t rtc_clk_cpu_freq_get()
 {
     rtc_cpu_freq_config_t config;
     rtc_clk_cpu_freq_get_config(&config);
-    rtc_cpu_freq_t freq;
+    rtc_cpu_freq_t freq = RTC_CPU_FREQ_XTAL;
     rtc_clk_cpu_freq_from_mhz_internal(config.freq_mhz, &freq);
     return freq;
 }