Changeset 268

Timestamp:

06/09/06 14:48:57 (6 years ago)

Author:

knok

Message:

Fixed segfault bug.

Location:

Search-Namazu/branches/0.96/Search-Namazu

Files:

• ChangeLog (modified) (1 diff)
• Namazu.xs (modified) (6 diffs)

Search-Namazu/branches/0.96/Search-Namazu/ChangeLog

@@ +1 @@
+2006-06-09  NOKUBI Takatsugu  <knok@daionet.gr.jp>
+
+        * Namazu.xs: Fixed segfault bug on perl 5.005_03.
+          (Patched by Tadamasa Teranishi, thank you)
+
 2006-06-06  NOKUBI Takatsugu  <knok@daionet.gr.jp>
 

Search-Namazu/branches/0.96/Search-Namazu/Namazu.xs

@@ -196 +196 @@
         PPCODE:
                 char *qstr;
+                char buffer[BUFSIZE];
                 char cqstr[BUFSIZE * 2];
                 AV *retar;
@@ -201 +202 @@
 
                 qstr = SvPV(query, PL_na);
-                nmz_codeconv_query(qstr);
-                strcpy(cqstr, qstr);
+                strncpy(buffer, qstr, BUFSIZE);
+                buffer[BUFSIZE - 1] = '\0';
+                nmz_codeconv_query(buffer);
+                strcpy(cqstr, buffer);
                 retar = call_search_main_c(cqstr, maxget);
 #if ! defined(PERL_VERSION) || (PERL_VERSION == 6 && PERL_SUBVERSION == 0)
                 { /* workaround for only one result */
-                        SV *ohlist = perl_eval_pv("new Search::Namazu::Result", TRUE);
-                        XPUSHs(ohlist);
+                        SPAGAIN;
                 }
 #endif /* PERL_VERSION */
                 while (av_len(retar) >= 0) {
-                        XPUSHs(av_pop(retar));
+                        XPUSHs(av_shift(retar));
                 }
                 nmz_free_internal();
@@ -222 +224 @@
         CODE:
                 char *qstr;
+                char buffer[BUFSIZE];
                 char cqstr[BUFSIZE * 2];
                 AV *retar;
@@ -227 +230 @@
 
                 qstr = SvPV(query, PL_na);
-                nmz_codeconv_query(qstr);
-                strcpy(cqstr, qstr);
+                strncpy(buffer, qstr, BUFSIZE);
+                buffer[BUFSIZE - 1] = '\0';
+                nmz_codeconv_query(buffer);
+                strcpy(cqstr, buffer);
                 retar = call_search_main_c(cqstr, maxget);
                 nmz_free_internal();
@@ -243 +248 @@
         CODE:
                 char *qstr;
+                char buffer[BUFSIZE];
                 char cqstr[BUFSIZE * 2];
                 AV *retar;
@@ -250 +256 @@
                 fields = (AV *) SvRV(fieldref);
                 qstr = SvPV(query, PL_na);
-                nmz_codeconv_query(qstr);
-                strcpy(cqstr, qstr);
+                strncpy(buffer, qstr, BUFSIZE);
+                buffer[BUFSIZE - 1] = '\0';
+                nmz_codeconv_query(buffer);
+                strcpy(cqstr, buffer);
                 retar = call_search_main_fields_c(cqstr, maxget, fields);
                 nmz_free_internal();