Changeset 4536

Timestamp:

Jun 18, 2013 4:08:08 AM (11 years ago)

Author:

ming

Message:

Closed #1678: Proper error handling in WAV writer

File:

• pjproject/trunk/pjmedia/src/pjmedia/wav_writer.c (modified) (3 diffs)

pjproject/trunk/pjmedia/src/pjmedia/wav_writer.c

@@ -399 +399 @@
     /* Get file size. */
     status = pj_file_getpos(fport->fd, &file_size);
-    PJ_ASSERT_RETURN(status == PJ_SUCCESS, status);
+    if (status != PJ_SUCCESS) {
+        pj_file_close(fport->fd);
+        return status;
+    }
 
     /* Calculate wave fields */
@@ -412 +415 @@
     /* Seek to the file_len field. */
     status = pj_file_setpos(fport->fd, FILE_LEN_POS, PJ_SEEK_SET);
-    PJ_ASSERT_RETURN(status == PJ_SUCCESS, status);
+    if (status != PJ_SUCCESS) {
+        pj_file_close(fport->fd);
+        return status;
+    }
 
     /* Write file_len */
     bytes = sizeof(wave_file_len);
     status = pj_file_write(fport->fd, &wave_file_len, &bytes);
-    PJ_ASSERT_RETURN(status == PJ_SUCCESS, status);
+    if (status != PJ_SUCCESS) {
+        pj_file_close(fport->fd);
+        return status;
+    }
 
     /* Write samples_len in FACT chunk */
@@ -431 +440 @@
         /* Seek to samples_len field. */
         status = pj_file_setpos(fport->fd, SAMPLES_LEN_POS, PJ_SEEK_SET);
-        PJ_ASSERT_RETURN(status == PJ_SUCCESS, status);
+        if (status != PJ_SUCCESS) {
+            pj_file_close(fport->fd);
+            return status;
+        }
 
         /* Write samples_len */
         bytes = sizeof(wav_samples_len);
         status = pj_file_write(fport->fd, &wav_samples_len, &bytes);
-        PJ_ASSERT_RETURN(status == PJ_SUCCESS, status);
+        if (status != PJ_SUCCESS) {
+            pj_file_close(fport->fd);
+            return status;
+        }
     }
 
     /* Seek to data_len field. */
     status = pj_file_setpos(fport->fd, data_len_pos, PJ_SEEK_SET);
-    PJ_ASSERT_RETURN(status == PJ_SUCCESS, status);
+    if (status != PJ_SUCCESS) {
+        pj_file_close(fport->fd);
+        return status;
+    }
 
     /* Write file_len */
     bytes = sizeof(wave_data_len);
     status = pj_file_write(fport->fd, &wave_data_len, &bytes);
-    PJ_ASSERT_RETURN(status == PJ_SUCCESS, status);
+    if (status != PJ_SUCCESS) {
+        pj_file_close(fport->fd);
+        return status;
+    }
 
     /* Close file */
     status = pj_file_close(fport->fd);
-    PJ_ASSERT_RETURN(status == PJ_SUCCESS, status);
+    if (status != PJ_SUCCESS)
+        return status;
 
     /* Done. */