Diff of /trunk/1.7.x/ccs-patch/security/ccsecurity/memory.c

TOMOYO

 Subversion リポジトリの参照



/[tomoyo]/trunk/1.7.x/ccs-patch/security/ccsecurity/memory.c




Diff of /trunk/1.7.x/ccs-patch/security/ccsecurity/memory.c



 Parent Directory

|  Revision Log



|  Patch














revision 2892 by kumaneko,
Tue Aug 11 02:02:02 2009 UTC




revision 2894 by kumaneko,
Tue Aug 11 08:15:11 2009 UTC






#

Line 240 
 void ccs_put_ipv6_address(const struct i


Line 240 
 void ccs_put_ipv6_address(const struct i












240
 void ccs_put_condition(struct ccs_condition *cond)
 void ccs_put_condition(struct ccs_condition *cond)

















241
 {
 {

















242
         const struct ccs_condition_element *condp;
         const struct ccs_condition_element *condp;















243


         const unsigned long *ulong_p;


         struct ccs_number_union *numbers_p;













244


         struct ccs_number_group **number_group_p;


         struct ccs_name_union *names_p;
















         const struct ccs_path_info **path_info_p;


 
















         struct ccs_path_group **path_group_p;


 















245
         const struct ccs_argv_entry *argv;
         const struct ccs_argv_entry *argv;

















246
         const struct ccs_envp_entry *envp;
         const struct ccs_envp_entry *envp;

















247
         u16 condc;
         u16 condc;















248


         u16 number_group_count;


         u16 numbers_count;













249


         u16 path_info_count;


         u16 names_count;
















         u16 path_group_count;


 















250
         u16 argc;
         u16 argc;

















251
         u16 envc;
         u16 envc;

















252
         u16 i;
         u16 i;











#

Line 265 
 void ccs_put_condition(struct ccs_condit


Line 262 
 void ccs_put_condition(struct ccs_condit












262
         if (!can_delete)
         if (!can_delete)

















263
                 return;
                 return;

















264
         condc = cond->condc;
         condc = cond->condc;















265


         number_group_count = cond->number_group_count;


         numbers_count = cond->numbers_count;













266


         path_info_count = cond->path_info_count;


         names_count = cond->names_count;
















         path_group_count = cond->path_group_count;


 















267
         argc = cond->argc;
         argc = cond->argc;

















268
         envc = cond->envc;
         envc = cond->envc;

















269
         condp = (const struct ccs_condition_element *) (cond + 1);
         condp = (const struct ccs_condition_element *) (cond + 1);















270


         ulong_p = (unsigned long *) (condp + condc);


         numbers_p = (struct ccs_number_union *) (condp + condc);













271


         number_group_p = (struct ccs_number_group **)


         names_p = (struct ccs_name_union *) (numbers_p + numbers_count);













272


                 (ulong_p + cond->ulong_count);


         argv = (const struct ccs_argv_entry *) (names_p + names_count);
















         path_info_p = (const struct ccs_path_info **)


 
















                 (number_group_p + number_group_count);


 
















         path_group_p = (struct ccs_path_group **)


 
















                 (path_info_p + path_info_count);


 
















         argv = (const struct ccs_argv_entry *)


 
















                 (path_group_p + path_group_count);


 















273
         envp = (const struct ccs_envp_entry *) (argv + argc);
         envp = (const struct ccs_envp_entry *) (argv + argc);















274


         for (i = 0; i < cond->number_group_count; i++)


         for (i = 0; i < cond->numbers_count; i++)













275


                 ccs_put_number_group(*number_group_p++);


                 ccs_put_number_union(numbers_p++);













276


         for (i = 0; i < cond->path_info_count; i++)


         for (i = 0; i < cond->names_count; i++)













277


                 ccs_put_name(*path_info_p++);


                 ccs_put_name_union(names_p++);
















         for (i = 0; i < cond->path_group_count; i++)


 
















                 ccs_put_path_group(*path_group_p++);


 















278
         for (i = 0; i < argc; argv++, i++)
         for (i = 0; i < argc; argv++, i++)

















279
                 ccs_put_name(argv->value);
                 ccs_put_name(argv->value);

















280
         for (i = 0; i < envc; envp++, i++) {
         for (i = 0; i < envc; envp++, i++) {





























Legend:



Removed from v.2892
 


changed lines


 
Added in v.2894













Back to OSDN">Back to OSDN
ViewVC Help


Powered by ViewVC 1.1.26
 /[tomoyo]/trunk/1.7.x/ccs-patch/security/ccsecurity/memory.c
-revision 2892 by kumaneko,
Tue Aug 11 02:02:02 2009 UTC
+revision 2894 by kumaneko,
Tue Aug 11 08:15:11 2009 UTC
 Line 240 
 void ccs_put_ipv6_address(const struct i
  void ccs_put_condition(struct ccs_condition *cond)
  {
          const struct ccs_condition_element *condp;
-         const unsigned long *ulong_p;
+         struct ccs_number_union *numbers_p;
-         struct ccs_number_group **number_group_p;
+         struct ccs_name_union *names_p;
-         const struct ccs_path_info **path_info_p;
-         struct ccs_path_group **path_group_p;
          const struct ccs_argv_entry *argv;
          const struct ccs_envp_entry *envp;
          u16 condc;
-         u16 number_group_count;
+         u16 numbers_count;
-         u16 path_info_count;
+         u16 names_count;
-         u16 path_group_count;
          u16 argc;
          u16 envc;
          u16 i;
-Line 265 
 void ccs_put_condition(struct ccs_condit
+Line 262 
 void ccs_put_condition(struct ccs_condit
          if (!can_delete)
                  return;
          condc = cond->condc;
-         number_group_count = cond->number_group_count;
+         numbers_count = cond->numbers_count;
-         path_info_count = cond->path_info_count;
+         names_count = cond->names_count;
-         path_group_count = cond->path_group_count;
          argc = cond->argc;
          envc = cond->envc;
          condp = (const struct ccs_condition_element *) (cond + 1);
-         ulong_p = (unsigned long *) (condp + condc);
+         numbers_p = (struct ccs_number_union *) (condp + condc);
-         number_group_p = (struct ccs_number_group **)
+         names_p = (struct ccs_name_union *) (numbers_p + numbers_count);
-                 (ulong_p + cond->ulong_count);
+         argv = (const struct ccs_argv_entry *) (names_p + names_count);
-         path_info_p = (const struct ccs_path_info **)
-                 (number_group_p + number_group_count);
-         path_group_p = (struct ccs_path_group **)
-                 (path_info_p + path_info_count);
-         argv = (const struct ccs_argv_entry *)
-                 (path_group_p + path_group_count);
          envp = (const struct ccs_envp_entry *) (argv + argc);
-         for (i = 0; i < cond->number_group_count; i++)
+         for (i = 0; i < cond->numbers_count; i++)
-                 ccs_put_number_group(*number_group_p++);
+                 ccs_put_number_union(numbers_p++);
-         for (i = 0; i < cond->path_info_count; i++)
+         for (i = 0; i < cond->names_count; i++)
-                 ccs_put_name(*path_info_p++);
+                 ccs_put_name_union(names_p++);
-         for (i = 0; i < cond->path_group_count; i++)
-                 ccs_put_path_group(*path_group_p++);
          for (i = 0; i < argc; argv++, i++)
                  ccs_put_name(argv->value);
          for (i = 0; i < envc; envp++, i++) {
 Legend:



Removed from v.2892
 


changed lines


 
Added in v.2894
 Legend:



Removed from v.2892
 


changed lines


 
Added in v.2894
-Removed from v.2892
+Added in v.2894
-Back to OSDN">Back to OSDN
+ViewVC Help
 Powered by ViewVC 1.1.26

オープンソース・ソフトウェアの開発とダウンロード

TOMOYO

Subversion リポジトリの参照