Fix code for vulnerability

- delete outbound checker ofr enum
- fix unmatched switch - case statement.

Signed-off-by: SeokHoon Lee <andy.shlee@samsung.com>
Change-Id: Id153ee0172e7908306c339ca56481bb4935749e6

diff --git a/packaging/capi-media-streamrecorder.spec b/packaging/capi-media-streamrecorder.spec
index 54faa2a..5c62813 100644 (file)
--- a/packaging/capi-media-streamrecorder.spec
+++ b/packaging/capi-media-streamrecorder.spec
@@ -1,6 +1,6 @@
 Name:       capi-media-streamrecorder
 Summary:    A Streamrecorder library in Tizen Native API
-Version:    0.0.12
+Version:    0.0.13
 Release:    0
 Group:      Multimedia/Other
 License:    Apache-2.0

diff --git a/src/streamrecorder_private.c b/src/streamrecorder_private.c
index 331e27a..6f7cc7b 100644 (file)
--- a/src/streamrecorder_private.c
+++ b/src/streamrecorder_private.c
@@ -623,7 +623,7 @@ int _streamrecorder_set_file_format(streamrecorder_h recorder, streamrecorder_fi
                return STREAMRECORDER_ERROR_INVALID_PARAMETER;
        }
 
-       if (format < STREAMRECORDER_FILE_FORMAT_3GP || format > STREAMRECORDER_FILE_FORMAT_WAV) {
+       if (format > STREAMRECORDER_FILE_FORMAT_WAV) {
                LOGE("invalid format %d", format);
                return STREAMRECORDER_ERROR_INVALID_PARAMETER;
        }
@@ -781,7 +781,7 @@ int _streamrecorder_set_audio_encoder(streamrecorder_h recorder, streamrecorder_
                return STREAMRECORDER_ERROR_INVALID_PARAMETER;
        }
 
-       if ((codec < STREAMRECORDER_AUDIO_CODEC_AMR || codec > STREAMRECORDER_AUDIO_CODEC_PCM)) {
+       if (codec > STREAMRECORDER_AUDIO_CODEC_PCM) {
                LOGE("invalid parameter : codec %d", codec);
                return STREAMRECORDER_ERROR_INVALID_PARAMETER;
        }
@@ -847,7 +847,7 @@ int _streamrecorder_set_video_encoder(streamrecorder_h recorder, streamrecorder_
        }
 
 
-       if (codec < STREAMRECORDER_VIDEO_CODEC_H263 || codec > STREAMRECORDER_VIDEO_CODEC_MPEG4) {
+       if (codec > STREAMRECORDER_VIDEO_CODEC_MPEG4) {
                LOGE("invalid codec %d", codec);
                return STREAMRECORDER_ERROR_INVALID_PARAMETER;
        }

diff --git a/test/streamrecorder_test.c b/test/streamrecorder_test.c
index 9f83c50..c195376 100644 (file)
--- a/test/streamrecorder_test.c
+++ b/test/streamrecorder_test.c
@@ -470,27 +470,27 @@ static void main_menu(gchar buf)
                        }
                } else if (recorder_state == STREAMRECORDER_STATE_RECORDING || recorder_state == STREAMRECORDER_STATE_PAUSED) {
                        switch (buf) {
+                       case 'p': /* Pause Recording*/
                            if (recorder_state == STREAMRECORDER_STATE_RECORDING) {
-                                       case 'p': /* Pause Recording*/
-                                               g_print("*Pause!\n");
-                                               err = streamrecorder_pause(hmstreamrecorder->recorder);
+                                       g_print("*Pause!\n");
+                                       err = streamrecorder_pause(hmstreamrecorder->recorder);
 
-                                               if (err < 0)
-                                                       LOGE("Rec pause streamrecorder_pause  = %x", err);
+                                       if (err < 0)
+                                               LOGE("Rec pause streamrecorder_pause  = %x", err);
 
-                                               recorder_state = STREAMRECORDER_STATE_PAUSED;
-                                       break;
-
-                           } else {
-                                       case 'r': /* Resume Recording*/
-                                               g_print("*Resume!\n");
-                                               err = streamrecorder_start(hmstreamrecorder->recorder);
-                                               if (err < 0)
-                                                       LOGE("Rec start streamrecorder_record  = %x", err);
-
-                                               recorder_state = STREAMRECORDER_STATE_RECORDING;
-                                               break;
+                                       recorder_state = STREAMRECORDER_STATE_PAUSED;
                            }
+                               break;
+                       case 'r': /* Resume Recording*/
+                               if (recorder_state == STREAMRECORDER_STATE_PAUSED) {
+                                       g_print("*Resume!\n");
+                                       err = streamrecorder_start(hmstreamrecorder->recorder);
+                                       if (err < 0)
+                                               LOGE("Rec start streamrecorder_record  = %x", err);
+
+                                       recorder_state = STREAMRECORDER_STATE_RECORDING;
+                           }
+                               break;
 
                        case 'c': /* Cancel*/
                                g_print("*Cancel Recording !\n");