[3.12] gh-120155: Fix Coverity issue in zoneinfo load_data() (GH-120232) (#120311)

miss-islington · vstinner · web-flow · commit ff980e3f7a8f · 2024-06-10T10:12:25.000Z
gh-120155: Fix Coverity issue in zoneinfo load_data() (GH-120232) Declare the 'rv' varaible at the top of the load_data() function to make sure that it's initialized before the first 'goto error' which uses 'rv' (return rv). Fix the Coverity issue: Error: UNINIT (CWE-457): Python-3.12.2/Modules/_zoneinfo.c:1233:5: skipped_decl: Jumping over declaration of ""rv"". Python-3.12.2/Modules/_zoneinfo.c:1284:5: uninit_use: Using uninitialized value ""rv"". 1282| } 1283| 1284|-> return rv; 1285| } 1286| (cherry picked from commit b90bd3e) Co-authored-by: Victor Stinner <vstinner@python.org>
diff --git a/Modules/_zoneinfo.c b/Modules/_zoneinfo.c
@@ -954,6 +954,7 @@ ttinfo_eq(const _ttinfo *const tti0, const _ttinfo *const tti1)
 static int
 load_data(zoneinfo_state *state, PyZoneInfo_ZoneInfo *self, PyObject *file_obj)
 {
+    int rv = 0;
     PyObject *data_tuple = NULL;
 
     long *utcoff = NULL;
@@ -1230,7 +1231,6 @@ load_data(zoneinfo_state *state, PyZoneInfo_ZoneInfo *self, PyObject *file_obj)
         }
     }
 
-    int rv = 0;
     goto cleanup;
 error:
     // These resources only need to be freed if we have failed, if we succeed

Original file line number	Diff line number	Diff line change
`@@ -954,6 +954,7 @@ ttinfo_eq(const _ttinfo const tti0, const _ttinfo const tti1)`
`954`	`954`	`static int`
`955`	`955`	`load_data(zoneinfo_state state, PyZoneInfo_ZoneInfo self, PyObject *file_obj)`
`956`	`956`	`{`
	`957`	`+ int rv = 0;`
`957`	`958`	`PyObject *data_tuple = NULL;`
`958`	`959`
`959`	`960`	`long *utcoff = NULL;`
`@@ -1230,7 +1231,6 @@ load_data(zoneinfo_state state, PyZoneInfo_ZoneInfo self, PyObject *file_obj)`
`1230`	`1231`	`}`
`1231`	`1232`	`}`
`1232`	`1233`
`1233`		`- int rv = 0;`
`1234`	`1234`	`goto cleanup;`
`1235`	`1235`	`error:`
`1236`	`1236`	`// These resources only need to be freed if we have failed, if we succeed`