diff --git a/src/modules/ecore_evas/engines/extn/ecore_evas_extn.c b/src/modules/ecore_evas/engines/extn/ecore_evas_extn.c
index af5f3de88d..16335da1d2 100644
--- a/src/modules/ecore_evas/engines/extn/ecore_evas_extn.c
+++ b/src/modules/ecore_evas/engines/extn/ecore_evas_extn.c
@@ -1021,16 +1021,20 @@ _ipc_server_data(void *data, int type EINA_UNUSED, void *event)
            {
               Ipc_Data_Update *ipc;
               int n = e->response;
+
               /* b->lockfd is not enough to ensure the size is same 
                * between what server knows, and client knows.
                * So should check file lock also. */
-              if (extn->b[n].buf && (!_extnbuf_lock_file_get(extn->b[n].buf)))
-                {  
-                   EINA_LIST_FREE(extn->file.updates, ipc)
+              if ((n >= 0) && (n < NBUF))
+                {
+                   if (extn->b[n].buf && (!_extnbuf_lock_file_get(extn->b[n].buf)))
                      {
-                        free(ipc);
+                        EINA_LIST_FREE(extn->file.updates, ipc)
+                          {
+                             free(ipc);
+                          }
+                        break;
                      }
-                   break;
                 }
 
               EINA_LIST_FREE(extn->file.updates, ipc)