Changeset 36 for trunk/pymigemo/pymigemo.c

Timestamp:

11/07/10 01:36:30 (13 years ago)

Author:

atzm

Message:

• check dictionary loadable

File:

• trunk/pymigemo/pymigemo.c (modified) (4 diffs)

trunk/pymigemo/pymigemo.c

@@ -11 +11 @@
 #include <stdbool.h>
 #include <string.h>
+#include <errno.h>
+#include <sys/types.h>
+#include <sys/stat.h>
+#include <fcntl.h>
+#include <unistd.h>
 
 #define PYMIGEMO_VERSION "0.3"
@@ -60 +65 @@
 }
 
+static int
+isloadable(const char *path)
+{
+    struct stat st;
+    int ret = 0;
+    int fd  = open(path, O_RDONLY);
+
+    if (fd < 0) {
+        return errno;
+    }
+
+    if (fstat(fd, &st) < 0) {
+        ret = errno;
+        goto isloadable_end;
+    }
+    if (S_ISDIR(st.st_mode)) {
+        ret = EISDIR;
+        goto isloadable_end;
+    }
+
+  isloadable_end:
+    if (close(fd) < 0) {
+        ret = errno;
+    }
+    return ret;
+}
+
 static void
 Migemo_dealloc(Migemo *self)
@@ -97 +129 @@
 
     if (dictionary) {
+        int ret = isloadable(dictionary);
+
+        if (ret != 0) {
+            PyErr_SetString(PyExc_ValueError, strerror(ret));
+            return -1;
+        }
+
         if (self->migemo_obj) {
             migemo_close(self->migemo_obj);
@@ -241 +280 @@
 
     if (dict_file) {
+        int ret = isloadable(dict_file);
+
+        if (ret != 0) {
+            PyErr_SetString(PyExc_ValueError, strerror(ret));
+            return NULL;
+        }
+
         result = PyInt_FromLong((long)migemo_load(self->migemo_obj, dict_id, dict_file));
     }